fix nginx warnings

2 files changed, 15 insertions, 39 deletions

diff --git a/linux/nginx/etc/nginx/conf.d/1kb.conf b/linux/nginx/etc/nginx/conf.d/1kb.conf
index 8b7f8e4..4dea167 100644
--- a/linux/nginx/etc/nginx/conf.d/1kb.conf
+++ b/linux/nginx/etc/nginx/conf.d/1kb.conf
@@ -3,6 +3,10 @@ server {
     http2 on;
     server_name 1kb.zerolabs.sh;
 
+    if ($host = 1kb.cleberg.net) {
+        return 301 https://1kb.zerolabs.sh$request_uri;
+    }
+
     root /var/www/1kb;
     index index.html;
 
@@ -14,6 +18,9 @@ server {
     gzip_vary off;
     charset off;
 
+    include custom.d/tls/ssl_engine.conf;
+    include custom.d/tls/certificate_files.conf;
+
     location = / {
         try_files /index.html =404;
     }
@@ -25,24 +32,6 @@ server {
 
 server {
     listen 80;
-    server_name 1kb.zerolabs.sh;
-    return 301 https://1kb.zerolabs.sh$request_uri;
-}
-
-server {
-    listen 80;
-    server_name 1kb.cleberg.net;
-    return 301 https://1kb.zerolabs.sh$request_uri;
-}
-server {
-    listen 443 ssl;
-    http2 on;
-    server_name 1kb.cleberg.net;
-
-    include custom.d/tls/ssl_engine.conf;
-    include custom.d/tls/certificate_files.conf;
-    include custom.d/tls/policy_strict.conf;
-
+    server_name 1kb.zerolabs.sh 1kb.cleberg.net;
     return 301 https://1kb.zerolabs.sh$request_uri;
 }
-
diff --git a/linux/nginx/etc/nginx/conf.d/art.conf b/linux/nginx/etc/nginx/conf.d/art.conf
index 811be74..c12b32c 100644
--- a/linux/nginx/etc/nginx/conf.d/art.conf
+++ b/linux/nginx/etc/nginx/conf.d/art.conf
@@ -1,8 +1,13 @@
 server {
 	listen 443 ssl;
 	http2 on;
-	server_name art.zerolabs.sh  mplqs2jxkjd5wxak3zjv55oxyadf4vwzx6ksgj4ztftndjl6elgsf4qd.onion;
+	server_name art.cleberg.net art.zerolabs.sh  mplqs2jxkjd5wxak3zjv55oxyadf4vwzx6ksgj4ztftndjl6elgsf4qd.onion;
 	add_header Onion-Location "http://mplqs2jxkjd5wxak3zjv55oxyadf4vwzx6ksgj4ztftndjl6elgsf4qd.onion$request_uri" always;
+
+	if ($host = art.cleberg.net) {
+		return 301 https://art.zerolabs.sh$request_uri;
+	}
+
 	include custom.d/tls/ssl_engine.conf;
 	include custom.d/tls/certificate_files.conf;
 	include custom.d/tls/policy_strict.conf;
@@ -17,24 +22,6 @@ server {
 
 server {
     listen 80;
-    server_name art.zerolabs.sh;
-    return 301 https://art.zerolabs.sh$request_uri;
-}
-
-server {
-    listen 80;
-    server_name art.cleberg.net;
-    return 301 https://art.zerolabs.sh$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    http2 on;
-    server_name art.cleberg.net;
-
-    include custom.d/tls/ssl_engine.conf;
-    include custom.d/tls/certificate_files.conf;
-    include custom.d/tls/policy_strict.conf;
-
+    server_name art.zerolabs.sh art.cleberg.net;
     return 301 https://art.zerolabs.sh$request_uri;
 }