From 508dcff6193ad605e88b828c86d092ec31456311 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 31 Jan 2021 11:57:05 -0500 Subject: updated to include htpasswd --- Bastillefile | 14 +++---- usr/local/etc/nginx/nginx.conf | 91 ++++++++++++++++++++++++------------------ 2 files changed, 59 insertions(+), 46 deletions(-) diff --git a/Bastillefile b/Bastillefile index fc385b9..ae3c7a9 100644 --- a/Bastillefile +++ b/Bastillefile @@ -1,7 +1,7 @@ # Dirs and mounts CMD mkdir -p /tmp/build -CMD mkdir -p /var/db/gl -FSTAB /zroot/gl /var/db/gl nullfs rw 0 0 +CMD mkdir -p /var/db/theglassyladies +FSTAB /zroot/theglassyladies /var/db/theglassyladies nullfs rw 0 0 # Prereqs PKG nginx yarn sqlite3 rust @@ -20,12 +20,12 @@ CMD mv /tmp/build/theglassyladies/iridescence/dist /var/www # Config OVERLAY usr -# Launch -CMD cd /var/db/gl ; dichroism -SYSRC nginx_enable=YES -SERVICE nginx start - # Cleanup CMD rm -rf /tmp/build CMD pkg remove -y yarn rust CMD pkg autoremove -y +# +# Launch +SYSRC nginx_enable=YES +SERVICE nginx start +CMD cd /var/db/theglassyladies ; dichroism >/var/log/dichroism.log & diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf index 555f7e0..efef87b 100644 --- a/usr/local/etc/nginx/nginx.conf +++ b/usr/local/etc/nginx/nginx.conf @@ -1,47 +1,60 @@ -server { - server_name theglassyladies.com; - listen 80; - rewrite ^/admin$ https://theglassyladies.com redirect; - rewrite ^/care$ https://theglassyladies.com redirect; - rewrite ^/faq$ https://theglassyladies.com redirect; - rewrite ^/privacy$ https://theglassyladies.com redirect; - rewrite ^/cart$ https://theglassyladies.com redirect; - rewrite ^/checkout$ https://theglassyladies.com redirect; - client_max_body_size 10M; - gzip on; - gzip_vary on; - #gzip_min_length 10240; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml; - gzip_disable "MSIE [1-6]\."; - sendfile on; - sendfile_max_chunk 1m; - keepalive_timeout 65; - - location / { - root /var/www; - index index.html; - try_files $uri $uri/ /index.html; - } +worker_processes 1; - location /login { - auth_basic "Glassy Ladies only!"; - auth_basic_user_file /var/db/gl/.htpasswd; - } +events { + worker_connections 1024; +} - location /images/ { - root /var/db/gl/images; - autoindex on; - } +http { + include mime.types; + default_type application_octet-stream; - location /api/ { - proxy_pass http://localhost:9876/; + sendfile on; - limit_except GET OPTIONS { + server { + server_name theglassyladies.com; + listen 80; + rewrite ^/admin$ https://theglassyladies.com redirect; + rewrite ^/care$ https://theglassyladies.com redirect; + rewrite ^/faq$ https://theglassyladies.com redirect; + rewrite ^/privacy$ https://theglassyladies.com redirect; + rewrite ^/cart$ https://theglassyladies.com redirect; + rewrite ^/checkout$ https://theglassyladies.com redirect; + client_max_body_size 10M; + gzip on; + gzip_vary on; + #gzip_min_length 10240; + gzip_proxied expired no-cache no-store private auth; + gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml; + gzip_disable "MSIE [1-6]\."; + sendfile on; + sendfile_max_chunk 1m; + keepalive_timeout 65; + + location / { + root /var/www; + index index.html; + try_files $uri $uri/ /index.html; + } + + location /login { auth_basic "Glassy Ladies only!"; - auth_basic_user_file /var/db/gl/.htpasswd; + auth_basic_user_file /var/db/theglassyladies/.htpasswd; + } + + location /images/ { + root /var/db/gl/images; + autoindex on; } + + location /api/ { + proxy_pass http://localhost:9876/; + + limit_except GET OPTIONS { + auth_basic "Glassy Ladies only!"; + auth_basic_user_file /var/db/theglassyladies/.htpasswd; + } + } + } - + } - -- cgit v1.2.3 From 923a0c35ff2cc4bef05f9fc7f029932735a3a78c Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sun, 31 Jan 2021 14:13:33 -0500 Subject: updated runtime files, added rc.d script for dichroism --- Bastillefile | 14 +++++++++----- usr/local/etc/nginx/nginx.conf | 6 +++--- usr/local/etc/rc.d/dichroism | 11 +++++++++++ 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 usr/local/etc/rc.d/dichroism diff --git a/Bastillefile b/Bastillefile index ae3c7a9..9c97a2b 100644 --- a/Bastillefile +++ b/Bastillefile @@ -1,3 +1,4 @@ +# TODO: user! # Dirs and mounts CMD mkdir -p /tmp/build CMD mkdir -p /var/db/theglassyladies @@ -14,18 +15,21 @@ CMD tar -xzvf /tmp/build/master.tar.gz -C /tmp/build CMD CARGO_HOME=/tmp/build SQLITE3_LIB_DIR=/usr/local/lib SQLITE3_INCLUDE_DIR=/usr/local/include cargo install --root /usr/local --path /tmp/build/theglassyladies/dichroism # Build frontend +CMD cp /var/db/theglassyladies/env.production /tmp/build/theglassyladies/iridescence/.env.production CMD cd /tmp/build/theglassyladies/iridescence ; yarn ; yarn build CMD mv /tmp/build/theglassyladies/iridescence/dist /var/www # Config OVERLAY usr +CMD chmod +x /usr/local/etc/rc.d/dichroism # Cleanup -CMD rm -rf /tmp/build -CMD pkg remove -y yarn rust -CMD pkg autoremove -y -# +#CMD rm -rf /tmp/build +#CMD pkg remove -y yarn rust +#CMD pkg autoremove -y + # Launch SYSRC nginx_enable=YES SERVICE nginx start -CMD cd /var/db/theglassyladies ; dichroism >/var/log/dichroism.log & +SYSRC dichroism_enable=YES +SERVICE dichroism start diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf index efef87b..c955077 100644 --- a/usr/local/etc/nginx/nginx.conf +++ b/usr/local/etc/nginx/nginx.conf @@ -38,11 +38,11 @@ http { location /login { auth_basic "Glassy Ladies only!"; - auth_basic_user_file /var/db/theglassyladies/.htpasswd; + auth_basic_user_file /var/db/theglassyladies/htpasswd; } location /images/ { - root /var/db/gl/images; + root /var/db/theglassyladies/images; autoindex on; } @@ -51,7 +51,7 @@ http { limit_except GET OPTIONS { auth_basic "Glassy Ladies only!"; - auth_basic_user_file /var/db/theglassyladies/.htpasswd; + auth_basic_user_file /var/db/theglassyladies/htpasswd; } } diff --git a/usr/local/etc/rc.d/dichroism b/usr/local/etc/rc.d/dichroism new file mode 100644 index 0000000..fba6f7c --- /dev/null +++ b/usr/local/etc/rc.d/dichroism @@ -0,0 +1,11 @@ +#!/bin/sh + +. /etc/rc.subr + +name="dichroism" +rcvar="${name}_enable" +command="/usr/local/bin/${name}" +start_cmd="cd /var/db/theglassyladies; ${command}" +load_rc_config $name +run_rc_command "$1" + -- cgit v1.2.3 From e0a28e8922ec89e8ab0142bf511ae81e31fcfb88 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sun, 31 Jan 2021 20:33:31 -0500 Subject: fixed image root being wrong --- usr/local/etc/nginx/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf index c955077..bb2f09a 100644 --- a/usr/local/etc/nginx/nginx.conf +++ b/usr/local/etc/nginx/nginx.conf @@ -42,7 +42,7 @@ http { } location /images/ { - root /var/db/theglassyladies/images; + root /var/db/theglassyladies; autoindex on; } -- cgit v1.2.3 From c2b8b817a80d7b8c8a756b5f099329d8e5bc1837 Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sun, 31 Jan 2021 20:39:47 -0500 Subject: auto worker_processes --- usr/local/etc/nginx/nginx.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/usr/local/etc/nginx/nginx.conf b/usr/local/etc/nginx/nginx.conf index bb2f09a..d049eec 100644 --- a/usr/local/etc/nginx/nginx.conf +++ b/usr/local/etc/nginx/nginx.conf @@ -1,4 +1,4 @@ -worker_processes 1; +worker_processes auto; events { worker_connections 1024; @@ -8,8 +8,6 @@ http { include mime.types; default_type application_octet-stream; - sendfile on; - server { server_name theglassyladies.com; listen 80; @@ -22,10 +20,10 @@ http { client_max_body_size 10M; gzip on; gzip_vary on; - #gzip_min_length 10240; gzip_proxied expired no-cache no-store private auth; gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml; gzip_disable "MSIE [1-6]\."; + sendfile on; sendfile_max_chunk 1m; keepalive_timeout 65; -- cgit v1.2.3