update rogue

2 files changed, 12 insertions, 12 deletions

diff --git a/linux/nginx/etc/nginx/conf.d/1kb.conf b/linux/nginx/etc/nginx/conf.d/rogue.conf
index f12fe40..03e0b98 100644
--- a/linux/nginx/etc/nginx/conf.d/1kb.conf
+++ b/linux/nginx/etc/nginx/conf.d/rogue.conf
@@ -1,12 +1,8 @@
 server {
     listen 10001;
-    server_name 1kb.zerolabs.sh 1kb.cleberg.net;
+    server_name rogue.krz.sh;
 
-    if ($host = 1kb.cleberg.net) {
-        return 301 https://1kb.zerolabs.sh$request_uri;
-    }
-
-    root /var/www/1kb;
+    root /var/www/rogue;
     index index.html;
 
     server_tokens off;
@@ -17,7 +13,6 @@ server {
     gzip_vary off;
     charset off;
 
-
     location = / {
         try_files /index.html =404;
     }
diff --git a/linux/nginx/etc/nginx/conf.d/zerolabs.sh.conf b/linux/nginx/etc/nginx/conf.d/zerolabs.sh.conf
index 34059dc..afdc3e3 100644
--- a/linux/nginx/etc/nginx/conf.d/zerolabs.sh.conf
+++ b/linux/nginx/etc/nginx/conf.d/zerolabs.sh.conf
@@ -1,7 +1,12 @@
+# zerolabs.sh -> krz.sh  (301, preserves subdomain + path + query)
+map $host $krz_target {
+    default                        krz.sh;
+    "~^(?<sub>.+)\.zerolabs\.sh$"  "$sub.krz.sh";
+}
+
 server {
-        listen 10000;
-        server_name zerolabs.sh;
-        root /var/www/zerolabs.sh/;
-        include custom.d/basic.conf;
-        location / { try_files $uri $uri/ =404; }
+    listen      10000;
+    server_name zerolabs.sh *.zerolabs.sh;
+
+    return 301 https://$krz_target$request_uri;
 }