diff --git a/deploy.sh b/deploy.sh index 30df3de..3d46f98 100644 --- a/deploy.sh +++ b/deploy.sh @@ -152,21 +152,20 @@ umask 0022 #cd /opt/stacks/mailcow #bash ./generate_config.sh < /dev/tty - - - -# install youtube downloader to /opt/stacks/downloader so it shows up in dockge - - - - -cd /opt/dockge -docker compose up -d - #disable stub listener echo "DNSStubListener=no" | tee -a /etc/systemd/resolved.conf + + +# up dockge +cd /opt/dockge +docker compose up -d + +# call replacements for nginx db + + + echo "" echo "" echo "" diff --git a/stacks/npm/data/database.sqlite b/stacks/npm/data/database.sqlite deleted file mode 100644 index d9f661f..0000000 Binary files a/stacks/npm/data/database.sqlite and /dev/null differ diff --git a/stacks/npm/nginx/proxy_host/1.conf b/stacks/npm/data/nginx/proxy_host/1.conf similarity index 91% rename from stacks/npm/nginx/proxy_host/1.conf rename to stacks/npm/data/nginx/proxy_host/1.conf index 3bc3cf3..54076da 100644 --- a/stacks/npm/nginx/proxy_host/1.conf +++ b/stacks/npm/data/nginx/proxy_host/1.conf @@ -10,14 +10,14 @@ map $scheme $hsts_header { server { set $forward_scheme http; - set $server "192.168.2.132"; + set $server "?localip?"; set $port 5001; listen 80; listen [::]:80; - server_name docker.sdgserver.online; + server_name docker.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/10.conf b/stacks/npm/data/nginx/proxy_host/10.conf similarity index 88% rename from stacks/npm/nginx/proxy_host/10.conf rename to stacks/npm/data/nginx/proxy_host/10.conf index 7a4a062..2bf561b 100644 --- a/stacks/npm/nginx/proxy_host/10.conf +++ b/stacks/npm/data/nginx/proxy_host/10.conf @@ -10,14 +10,14 @@ map $scheme $hsts_header { server { set $forward_scheme http; - set $server "192.168.2.132"; + set $server "?localip?"; set $port 81; listen 80; listen [::]:80; - server_name proxy.sdgserver.online; + server_name proxy.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/11.conf b/stacks/npm/data/nginx/proxy_host/11.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/11.conf rename to stacks/npm/data/nginx/proxy_host/11.conf index f5516f3..61e4f66 100644 --- a/stacks/npm/nginx/proxy_host/11.conf +++ b/stacks/npm/data/nginx/proxy_host/11.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name office.sdgserver.online; + server_name office.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/12.conf b/stacks/npm/data/nginx/proxy_host/12.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/12.conf rename to stacks/npm/data/nginx/proxy_host/12.conf index efb0c0a..b7d6444 100644 --- a/stacks/npm/nginx/proxy_host/12.conf +++ b/stacks/npm/data/nginx/proxy_host/12.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name cloud.sdgserver.online; + server_name cloud.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/13.conf b/stacks/npm/data/nginx/proxy_host/13.conf similarity index 96% rename from stacks/npm/nginx/proxy_host/13.conf rename to stacks/npm/data/nginx/proxy_host/13.conf index 86d1c06..c1f0e37 100644 --- a/stacks/npm/nginx/proxy_host/13.conf +++ b/stacks/npm/data/nginx/proxy_host/13.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name www.sdgserver.online; + server_name www.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/14.conf b/stacks/npm/data/nginx/proxy_host/14.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/14.conf rename to stacks/npm/data/nginx/proxy_host/14.conf index 093e292..eb0a538 100644 --- a/stacks/npm/nginx/proxy_host/14.conf +++ b/stacks/npm/data/nginx/proxy_host/14.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name vault.sdgserver.online; + server_name vault.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/15.conf b/stacks/npm/data/nginx/proxy_host/15.conf similarity index 96% rename from stacks/npm/nginx/proxy_host/15.conf rename to stacks/npm/data/nginx/proxy_host/15.conf index 0f545ab..525ca26 100644 --- a/stacks/npm/nginx/proxy_host/15.conf +++ b/stacks/npm/data/nginx/proxy_host/15.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name vpn.sdgserver.online; + server_name vpn.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/16.conf b/stacks/npm/data/nginx/proxy_host/16.conf similarity index 91% rename from stacks/npm/nginx/proxy_host/16.conf rename to stacks/npm/data/nginx/proxy_host/16.conf index 6782d88..6f01dde 100644 --- a/stacks/npm/nginx/proxy_host/16.conf +++ b/stacks/npm/data/nginx/proxy_host/16.conf @@ -10,14 +10,14 @@ map $scheme $hsts_header { server { set $forward_scheme https; - set $server "192.168.2.132"; + set $server "?localip?"; set $port 1443; listen 80; listen [::]:80; - server_name mail.sdgserver.online; + server_name mail.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/17.conf b/stacks/npm/data/nginx/proxy_host/17.conf similarity index 94% rename from stacks/npm/nginx/proxy_host/17.conf rename to stacks/npm/data/nginx/proxy_host/17.conf index 2cd11ab..53f567b 100644 --- a/stacks/npm/nginx/proxy_host/17.conf +++ b/stacks/npm/data/nginx/proxy_host/17.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name dozzle.sdgserver.online; + server_name dozzle.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/18.conf b/stacks/npm/data/nginx/proxy_host/18.conf similarity index 94% rename from stacks/npm/nginx/proxy_host/18.conf rename to stacks/npm/data/nginx/proxy_host/18.conf index 460bd87..2dacb6e 100644 --- a/stacks/npm/nginx/proxy_host/18.conf +++ b/stacks/npm/data/nginx/proxy_host/18.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name dns.sdgserver.online; + server_name dns.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/2.conf b/stacks/npm/data/nginx/proxy_host/2.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/2.conf rename to stacks/npm/data/nginx/proxy_host/2.conf index 477468c..505a084 100644 --- a/stacks/npm/nginx/proxy_host/2.conf +++ b/stacks/npm/data/nginx/proxy_host/2.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name docs.sdgserver.online; + server_name docs.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/3.conf b/stacks/npm/data/nginx/proxy_host/3.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/3.conf rename to stacks/npm/data/nginx/proxy_host/3.conf index 5ef7d60..6226cfa 100644 --- a/stacks/npm/nginx/proxy_host/3.conf +++ b/stacks/npm/data/nginx/proxy_host/3.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name browser.sdgserver.online; + server_name browser.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/4.conf b/stacks/npm/data/nginx/proxy_host/4.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/4.conf rename to stacks/npm/data/nginx/proxy_host/4.conf index 8d2532f..69ce647 100644 --- a/stacks/npm/nginx/proxy_host/4.conf +++ b/stacks/npm/data/nginx/proxy_host/4.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name convert.sdgserver.online; + server_name convert.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/5.conf b/stacks/npm/data/nginx/proxy_host/5.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/5.conf rename to stacks/npm/data/nginx/proxy_host/5.conf index a55e60a..3f6fa09 100644 --- a/stacks/npm/nginx/proxy_host/5.conf +++ b/stacks/npm/data/nginx/proxy_host/5.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name dash.sdgserver.online; + server_name dash.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/6.conf b/stacks/npm/data/nginx/proxy_host/6.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/6.conf rename to stacks/npm/data/nginx/proxy_host/6.conf index cccc8ec..6941b50 100644 --- a/stacks/npm/nginx/proxy_host/6.conf +++ b/stacks/npm/data/nginx/proxy_host/6.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name download.sdgserver.online; + server_name download.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/7.conf b/stacks/npm/data/nginx/proxy_host/7.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/7.conf rename to stacks/npm/data/nginx/proxy_host/7.conf index 1e29350..1e0a64b 100644 --- a/stacks/npm/nginx/proxy_host/7.conf +++ b/stacks/npm/data/nginx/proxy_host/7.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name tools.sdgserver.online; + server_name tools.?domain?; http2 off; diff --git a/stacks/npm/nginx/proxy_host/8.conf b/stacks/npm/data/nginx/proxy_host/8.conf similarity index 100% rename from stacks/npm/nginx/proxy_host/8.conf rename to stacks/npm/data/nginx/proxy_host/8.conf diff --git a/stacks/npm/nginx/proxy_host/9.conf b/stacks/npm/data/nginx/proxy_host/9.conf similarity index 95% rename from stacks/npm/nginx/proxy_host/9.conf rename to stacks/npm/data/nginx/proxy_host/9.conf index d5a43d1..deaf77c 100644 --- a/stacks/npm/nginx/proxy_host/9.conf +++ b/stacks/npm/data/nginx/proxy_host/9.conf @@ -17,7 +17,7 @@ server { listen [::]:80; - server_name status.sdgserver.online; + server_name status.?domain?; http2 off;