diff options
| -rw-r--r-- | Bastillefile | 14 | ||||
| -rw-r--r-- | 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; + } + } + } - + } - |