fix: resolve multiple server names in default.conf and multiple 443 blocks in ao

3 files changed, 6 insertions, 31 deletions

diff --git a/linux/nginx/etc/nginx/conf.d/no-ssl.default.conf b/linux/nginx/etc/nginx/conf.d/.no-ssl.default.conf
index de6b2d7..de6b2d7 100644
--- a/linux/nginx/etc/nginx/conf.d/no-ssl.default.conf
+++ b/linux/nginx/etc/nginx/conf.d/.no-ssl.default.conf
diff --git a/linux/nginx/etc/nginx/conf.d/ao.conf b/linux/nginx/etc/nginx/conf.d/ao.conf
index 31e2087..588bc61 100644
--- a/linux/nginx/etc/nginx/conf.d/ao.conf
+++ b/linux/nginx/etc/nginx/conf.d/ao.conf
@@ -2,7 +2,12 @@ server {
 	listen [::]:443 ssl;
 	listen 443 ssl;
 	http2 on;
-	server_name ao.zerolabs.sh;
+	server_name ao.zerolabs.sh ao.cleberg.net;
+
+	if ($host = ao.cleberg.net) {
+		return 301 https://ao.zerolabs.sh$request_uri;
+	}
+
 	add_header Onion-Location "http://7lyqrn4ofxdq7lfporviu44zpc42wooh2bqazfhvpscgwby2vcwldzad.onion$request_uri" always;
 	include custom.d/tls/ssl_engine.conf;
 	include custom.d/tls/certificate_files.conf;
@@ -29,16 +34,3 @@ server {
     server_name ao.cleberg.net;
     return 301 https://ao.zerolabs.sh$request_uri;
 }
-
-server {
-    listen 443 ssl;
-    listen [::]:443 ssl;
-    http2 on;
-    server_name ao.cleberg.net;
-
-    include custom.d/tls/ssl_engine.conf;
-    include custom.d/tls/certificate_files.conf;
-    include custom.d/tls/policy_strict.conf;
-
-    return 301 https://ao.zerolabs.sh$request_uri;
-}
diff --git a/linux/nginx/etc/nginx/conf.d/default.conf b/linux/nginx/etc/nginx/conf.d/default.conf
deleted file mode 100644
index 3aa1909..0000000
--- a/linux/nginx/etc/nginx/conf.d/default.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-server {
-    listen [::]:443 ssl default_server;
-    listen 443 ssl default_server;
-    http2 on;
-    server_name _;
-    include custom.d/tls/ssl_engine.conf;
-    include custom.d/tls/certificate_files.conf;
-    include custom.d/tls/policy_strict.conf;
-    return 444;
-}
-
-server {
-    listen [::]:80;
-    listen 80;
-    server_name _;
-    return 444;
-}