From 3f60e858f51b028f31234e9c229e1faf059c67ef Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Mon, 11 Dec 2023 19:05:00 -0800 Subject: [PATCH] switch more includes to relative paths --- sites/default.conf | 2 +- sites/gitea.conf | 2 +- sites/homepage.conf | 6 +++--- sites/ldap.conf | 6 +++--- sites/mail.conf | 2 +- sites/opns.conf | 6 +++--- sites/paas.conf | 6 +++--- sites/pve.conf | 2 +- sites/root.conf | 6 +++--- sites/status.conf | 6 +++--- sites/wiki.conf | 6 +++--- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sites/default.conf b/sites/default.conf index a7ee54c..8a1e19f 100644 --- a/sites/default.conf +++ b/sites/default.conf @@ -1,6 +1,6 @@ server { listen 443 ssl http2 default_server; server_name *.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; + include snippets/ssl-acme.conf; return 301 https://tronnet.net; } diff --git a/sites/gitea.conf b/sites/gitea.conf index 7514ba0..92df222 100644 --- a/sites/gitea.conf +++ b/sites/gitea.conf @@ -1,7 +1,7 @@ server { listen 443 ssl http2; server_name git.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; + include snippets/ssl-acme.conf; location / { proxy_pass http://gitea.dmz:3000; proxy_redirect default; diff --git a/sites/homepage.conf b/sites/homepage.conf index 3e96630..0611230 100644 --- a/sites/homepage.conf +++ b/sites/homepage.conf @@ -1,9 +1,9 @@ server { listen 443 ssl http2; server_name tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - include /etc/nginx/snippets/proxy-errors.conf; - include /etc/nginx/snippets/error-pages.conf; + include snippets/ssl-acme.conf; + include snippets/proxy-errors.conf; + include snippets/error-pages.conf; location / { proxy_pass http://sites.dmz:80; proxy_redirect default; diff --git a/sites/ldap.conf b/sites/ldap.conf index d1db720..4730b76 100644 --- a/sites/ldap.conf +++ b/sites/ldap.conf @@ -1,9 +1,9 @@ server { listen 443 ssl http2; server_name ldap.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - include /etc/nginx/snippets/proxy-errors.conf; - include /etc/nginx/snippets/error-pages.conf; + include snippets/ssl-acme.conf; + include snippets/proxy-errors.conf; + include snippets/error-pages.conf; location / { proxy_pass http://ldap.dmz:80; proxy_redirect default; diff --git a/sites/mail.conf b/sites/mail.conf index 30cf3e3..8fc1005 100644 --- a/sites/mail.conf +++ b/sites/mail.conf @@ -1,7 +1,7 @@ server { listen 443 ssl http2; server_name mail.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; + include snippets/ssl-acme.conf; location / { proxy_pass http://mail.dmz/; proxy_redirect default; diff --git a/sites/opns.conf b/sites/opns.conf index bddd796..6ce0571 100644 --- a/sites/opns.conf +++ b/sites/opns.conf @@ -1,9 +1,9 @@ server { listen 443 ssl http2; server_name opns.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - include /etc/nginx/snippets/proxy-errors.conf; - include /etc/nginx/snippets/error-pages.conf; + include snippets/ssl-acme.conf; + include snippets/proxy-errors.conf; + include snippets/error-pages.conf; location / { proxy_pass https://10.0.0.1:10443; proxy_redirect default; diff --git a/sites/paas.conf b/sites/paas.conf index f0c760d..0079d4d 100644 --- a/sites/paas.conf +++ b/sites/paas.conf @@ -1,10 +1,10 @@ server { listen 443 ssl http2; server_name paas.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - include /etc/nginx/snippets/error-pages.conf; + include snippets/ssl-acme.conf; + include snippets/error-pages.conf; location /dashboard/ { - include /etc/nginx/snippets/proxy-errors.conf; + include snippets/proxy-errors.conf; proxy_pass http://proxmoxaas.dmz:8080/; proxy_redirect default; } diff --git a/sites/pve.conf b/sites/pve.conf index 53c5b34..b4e8733 100644 --- a/sites/pve.conf +++ b/sites/pve.conf @@ -1,7 +1,7 @@ server { listen 443 ssl http2; server_name pve.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; + include snippets/ssl-acme.conf; location / { proxy_pass https://geigatron-0-pve.tn:8006; proxy_redirect default; diff --git a/sites/root.conf b/sites/root.conf index debbe7b..db59cb8 100644 --- a/sites/root.conf +++ b/sites/root.conf @@ -1,9 +1,9 @@ server { listen 443 ssl http2; server_name root.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - include /etc/nginx/snippets/proxy-errors.conf; - include /etc/nginx/snippets/error-pages.conf; + include snippets/ssl-acme.conf; + include snippets/proxy-errors.conf; + include snippets/error-pages.conf; location / { proxy_pass http://root.root:80; proxy_redirect default; diff --git a/sites/status.conf b/sites/status.conf index 7cefe28..2d83cfd 100644 --- a/sites/status.conf +++ b/sites/status.conf @@ -1,9 +1,9 @@ server { listen 443 ssl http2; server_name status.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - include /etc/nginx/snippets/proxy-errors.conf; - include /etc/nginx/snippets/error-pages.conf; + include snippets/ssl-acme.conf; + include snippets/proxy-errors.conf; + include snippets/error-pages.conf; location / { proxy_pass http://sites.dmz:8080; proxy_redirect default; diff --git a/sites/wiki.conf b/sites/wiki.conf index 9a7595f..5f41bb1 100644 --- a/sites/wiki.conf +++ b/sites/wiki.conf @@ -1,9 +1,9 @@ server { listen 443 ssl http2; server_name wiki.tronnet.net; - include /etc/nginx/snippets/ssl-acme.conf; - include /etc/nginx/snippets/proxy-errors.conf; - include /etc/nginx/snippets/error-pages.conf; + include snippets/ssl-acme.conf; + include snippets/proxy-errors.conf; + include snippets/error-pages.conf; location / { proxy_pass http://sites.dmz:8081; proxy_redirect default;