remove dupe conf file, mark some as offline, update homepage

diff --git a/etc/nginx/conf.d/default.dev.conf b/etc/nginx/conf.d/default.dev.conf
index 2a7b71da629149c35425ee403cc6e60ba6e8a725..7ef1660443959bbb813581914e8755ccf592c2b7 100644 (file)
--- a/etc/nginx/conf.d/default.dev.conf
+++ b/etc/nginx/conf.d/default.dev.conf
@@ -37,7 +37,7 @@ server {
 
 # Store Front (MedusaJS)
 server {
-  # Service: Store | https://store.nutra.tk
+  # [OFFLINE] Service: Store | https://store.nutra.tk
   server_name store.nutra.tk;
   #listen 80;
   listen 443 ssl;
@@ -55,7 +55,7 @@ server {
 
 # Store [Admin UI] (MedusaJS)
 server {
-  # Service: Store Admin | https://store-admin-8b56411b.nutra.tk
+  # [OFFLINE] Service: Store Admin | https://store-admin-8b56411b.nutra.tk
   server_name store-api.nutra.tk store-admin-8b56411b.nutra.tk;
   #listen 80;
   listen 443 ssl;

diff --git a/etc/nginx/conf.d/fowarded.conf b/etc/nginx/conf.d/fowarded.conf
deleted file mode 100644 (file)
index 7141d89..0000000
--- a/etc/nginx/conf.d/fowarded.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# RFC 7239 Forwarded header for Nginx proxy_pass
-
-# Add within your server or location block:
-#    proxy_set_header forwarded "$proxy_forwarded;secret=\"YOUR SECRET\"";
-
-# Configure your upstream web server to identify this proxy by that password
-# because otherwise anyone on the Internet could spoof these headers and fake
-# their real IP address and other information to your service.
-
-
-# Provide the full proxy chain in $proxy_forwarded
-map $proxy_add_forwarded $proxy_forwarded {
-  default "$proxy_add_forwarded;by=\"_$hostname\";proto=$scheme;host=\"$http_host\";path=\"$request_uri\"";
-}
-
-# The following mappings are based on
-# https://www.nginx.com/resources/wiki/start/topics/examples/forwarded/
-
-map $remote_addr $proxy_forwarded_elem {
-  # IPv4 addresses can be sent as-is
-  ~^[0-9.]+$          "for=$remote_addr";
-
-  # IPv6 addresses need to be bracketed and quoted
-  ~^[0-9A-Fa-f:.]+$   "for=\"[$remote_addr]\"";
-
-  # Unix domain socket names cannot be represented in RFC 7239 syntax
-  default             "for=unknown";
-}
-
-map $http_forwarded $proxy_add_forwarded {
-  # If the incoming Forwarded header is syntactically valid, append to it
-  "~^(,[ \\t]*)*([!#$%&'*+.^_`|~0-9A-Za-z-]+=([!#$%&'*+.^_`|~0-9A-Za-z-]+|\"([\\t \\x21\\x23-\\x5B\\x5D-\\x7E\\x80-\\xFF]|\\\\[\\t \\x21-\\x7E\\x80-\\xFF])*\"))?(;([!#$%&'*+.^_`|~0-9A-Za-z-]+=([!#$%&'*+.^_`|~0-9A-Za-z-]+|\"([\\t \\x21\\x23-\\x5B\\x5D-\\x7E\\x80-\\xFF]|\\\\[\\t \\x21-\\x7E\\x80-\\xFF])*\"))?)*([ \\t]*,([ \\t]*([!#$%&'*+.^_`|~0-9A-Za-z-]+=([!#$%&'*+.^_`|~0-9A-Za-z-]+|\"([\\t \\x21\\x23-\\x5B\\x5D-\\x7E\\x80-\\xFF]|\\\\[\\t \\x21-\\x7E\\x80-\\xFF])*\"))?(;([!#$%&'*+.^_`|~0-9A-Za-z-]+=([!#$%&'*+.^_`|~0-9A-Za-z-]+|\"([\\t \\x21\\x23-\\x5B\\x5D-\\x7E\\x80-\\xFF]|\\\\[\\t \\x21-\\x7E\\x80-\\xFF])*\"))?)*)?)*$" "$http_forwarded, $proxy_forwarded_elem";
-
-  # Otherwise, replace it
-  default "$proxy_forwarded_elem";
-}
-

diff --git a/etc/nginx/conf.d/moms-website.conf.disabled b/etc/nginx/conf.d/moms-website.conf.disabled
deleted file mode 100644 (file)
index 360fec4..0000000
--- a/etc/nginx/conf.d/moms-website.conf.disabled
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file exists to trigger the deletion of moms-website.conf 
-# via the deployment script's cleanup logic.

diff --git a/scripts/homepage.html b/scripts/homepage.html
index b4d5927fc5460e283dd3229ddbc9e1923796e480..394c45ecd296f79863f011e2e4574f908b860699 100644 (file)
--- a/scripts/homepage.html
+++ b/scripts/homepage.html
@@ -34,14 +34,6 @@
         <div class="service">
             <h3><a href="https://chat.nutra.tk">https://chat.nutra.tk</a></h3>
             <div class="desc">Matrix Chat</div>
-        </div>
-        <div class="service">
-            <h3><a href="https://store.nutra.tk">https://store.nutra.tk</a></h3>
-            <div class="desc">Store</div>
-        </div>
-        <div class="service">
-            <h3><a href="https://store-admin-8b56411b.nutra.tk">https://store-admin-8b56411b.nutra.tk</a></h3>
-            <div class="desc">Store Admin</div>
         </div><h2 class="group-header">Git Services</h2>
         <div class="service">
             <h3><a href="https://git.nutra.tk/v1">https://git.nutra.tk/v1</a></h3>