From 9808e700b51d6383df6a6234ac6c358867b4efe2 Mon Sep 17 00:00:00 2001 From: Christian Cleberg Date: Thu, 9 Apr 2026 18:33:12 -0500 Subject: migrate service URIs to zerolabs.sh --- linux/nginx/etc/nginx/conf.d/1kb.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/ao.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/art.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/auth.conf | 15 +----------- linux/nginx/etc/nginx/conf.d/br.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/bt.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/bw.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/cc.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/cleberg.net.conf | 33 +-------------------------- linux/nginx/etc/nginx/conf.d/ddns.conf | 15 +----------- linux/nginx/etc/nginx/conf.d/files.conf | 17 ++------------ linux/nginx/etc/nginx/conf.d/gh.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/gramps.conf | 17 ++------------ linux/nginx/etc/nginx/conf.d/ha.conf | 15 +----------- linux/nginx/etc/nginx/conf.d/hat.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/hn.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/irc.conf | 15 +----------- linux/nginx/etc/nginx/conf.d/ld.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/lt.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/mz.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/office.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/org.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/paste.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/pb.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/photos.conf | 17 ++------------ linux/nginx/etc/nginx/conf.d/pin.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/piped.conf | 11 +++++++-- linux/nginx/etc/nginx/conf.d/projects.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/rd.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/rimgo.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/rl.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/rss.conf | 15 +----------- linux/nginx/etc/nginx/conf.d/search.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/send.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/slash.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/small.conf | 7 ++++++ linux/nginx/etc/nginx/conf.d/ssh.conf | 15 +----------- 37 files changed, 204 insertions(+), 163 deletions(-) (limited to 'linux') diff --git a/linux/nginx/etc/nginx/conf.d/1kb.conf b/linux/nginx/etc/nginx/conf.d/1kb.conf index c992b76..d158559 100644 --- a/linux/nginx/etc/nginx/conf.d/1kb.conf +++ b/linux/nginx/etc/nginx/conf.d/1kb.conf @@ -23,6 +23,13 @@ server { } } +server { + listen 80; + listen [::]:80; + server_name 1kb.zerolabs.sh; + return 301 https://1kb.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/ao.conf b/linux/nginx/etc/nginx/conf.d/ao.conf index 7304ecf..31e2087 100644 --- a/linux/nginx/etc/nginx/conf.d/ao.conf +++ b/linux/nginx/etc/nginx/conf.d/ao.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name ao.zerolabs.sh; + return 301 https://ao.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/art.conf b/linux/nginx/etc/nginx/conf.d/art.conf index c092279..ce07e7d 100644 --- a/linux/nginx/etc/nginx/conf.d/art.conf +++ b/linux/nginx/etc/nginx/conf.d/art.conf @@ -15,6 +15,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name art.zerolabs.sh; + return 301 https://art.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/auth.conf b/linux/nginx/etc/nginx/conf.d/auth.conf index de9514f..8c309d1 100644 --- a/linux/nginx/etc/nginx/conf.d/auth.conf +++ b/linux/nginx/etc/nginx/conf.d/auth.conf @@ -18,19 +18,6 @@ server { server { listen 80; listen [::]:80; - server_name auth.cleberg.net; - return 301 https://auth.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name auth.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 auth.zerolabs.sh; return 301 https://auth.zerolabs.sh$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/br.conf b/linux/nginx/etc/nginx/conf.d/br.conf index b9adf8c..f33683f 100644 --- a/linux/nginx/etc/nginx/conf.d/br.conf +++ b/linux/nginx/etc/nginx/conf.d/br.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name br.zerolabs.sh; + return 301 https://br.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/bt.conf b/linux/nginx/etc/nginx/conf.d/bt.conf index ad98160..4b28659 100644 --- a/linux/nginx/etc/nginx/conf.d/bt.conf +++ b/linux/nginx/etc/nginx/conf.d/bt.conf @@ -34,6 +34,13 @@ server { } } +server { + listen 80; + listen [::]:80; + server_name bt.zerolabs.sh; + return 301 https://bt.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/bw.conf b/linux/nginx/etc/nginx/conf.d/bw.conf index ef9464e..de7ad2c 100644 --- a/linux/nginx/etc/nginx/conf.d/bw.conf +++ b/linux/nginx/etc/nginx/conf.d/bw.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name bw.zerolabs.sh; + return 301 https://bw.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/cc.conf b/linux/nginx/etc/nginx/conf.d/cc.conf index feff05f..efa9b16 100644 --- a/linux/nginx/etc/nginx/conf.d/cc.conf +++ b/linux/nginx/etc/nginx/conf.d/cc.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name cc.zerolabs.sh; + return 301 https://cc.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/cleberg.net.conf b/linux/nginx/etc/nginx/conf.d/cleberg.net.conf index 2f58471..660b581 100644 --- a/linux/nginx/etc/nginx/conf.d/cleberg.net.conf +++ b/linux/nginx/etc/nginx/conf.d/cleberg.net.conf @@ -1,14 +1,3 @@ -server { - listen [::]:443 ssl; - listen 443 ssl; - http2 on; - server_name www.zerolabs.sh; - include custom.d/tls/ssl_engine.conf; - include custom.d/tls/certificate_files.conf; - include custom.d/tls/policy_strict.conf; - return 301 $scheme://cleberg.net$request_uri; -} - server { listen [::]:443 ssl; listen 443 ssl; @@ -57,7 +46,7 @@ server { server { listen [::]:80; listen 80; - server_name www.zerolabs.sh cleberg.net; + server_name www.cleberg.net cleberg.net; return 301 https://cleberg.net$request_uri; } @@ -95,23 +84,3 @@ server { location /atom.xml { return 301 $scheme://$host/feed.xml; } location /blog/salary-transparency.html { return 301 $scheme://$host/salary/; } } - -server { - listen 80; - listen [::]:80; - server_name www.cleberg.net; - return 301 https://www.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name www.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://www.zerolabs.sh$request_uri; -} diff --git a/linux/nginx/etc/nginx/conf.d/ddns.conf b/linux/nginx/etc/nginx/conf.d/ddns.conf index deb916e..4992d7b 100644 --- a/linux/nginx/etc/nginx/conf.d/ddns.conf +++ b/linux/nginx/etc/nginx/conf.d/ddns.conf @@ -20,19 +20,6 @@ server { server { listen 80; listen [::]:80; - server_name ddns.cleberg.net; - return 301 https://ddns.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name ddns.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 ddns.zerolabs.sh; return 301 https://ddns.zerolabs.sh$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/files.conf b/linux/nginx/etc/nginx/conf.d/files.conf index 45add18..754b576 100644 --- a/linux/nginx/etc/nginx/conf.d/files.conf +++ b/linux/nginx/etc/nginx/conf.d/files.conf @@ -2,7 +2,7 @@ server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name files.zerolabs.sh; + server_name files.cleberg.net; add_header Onion-Location "http://yt2y635dc6zyxziy5ytkfz36bmkgcxuccq3meom6qp44gjdat54wt5id.onion$request_uri" always; include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; @@ -26,18 +26,5 @@ server { listen 80; listen [::]:80; server_name files.cleberg.net; - return 301 https://files.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name files.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://files.zerolabs.sh$request_uri; + return 301 https://files.cleberg.net$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/gh.conf b/linux/nginx/etc/nginx/conf.d/gh.conf index 070a15f..0c67f4a 100644 --- a/linux/nginx/etc/nginx/conf.d/gh.conf +++ b/linux/nginx/etc/nginx/conf.d/gh.conf @@ -15,6 +15,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name gh.zerolabs.sh; + return 301 https://gh.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/gramps.conf b/linux/nginx/etc/nginx/conf.d/gramps.conf index 6f03bc9..b1ab352 100644 --- a/linux/nginx/etc/nginx/conf.d/gramps.conf +++ b/linux/nginx/etc/nginx/conf.d/gramps.conf @@ -2,7 +2,7 @@ server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name gramps.zerolabs.sh; + server_name gramps.cleberg.net; include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_strict.conf; @@ -21,18 +21,5 @@ server { listen 80; listen [::]:80; server_name gramps.cleberg.net; - return 301 https://gramps.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name gramps.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://gramps.zerolabs.sh$request_uri; + return 301 https://gramps.cleberg.net$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/ha.conf b/linux/nginx/etc/nginx/conf.d/ha.conf index 1917a3d..48e08e3 100644 --- a/linux/nginx/etc/nginx/conf.d/ha.conf +++ b/linux/nginx/etc/nginx/conf.d/ha.conf @@ -24,19 +24,6 @@ server { server { listen 80; listen [::]:80; - server_name ha.cleberg.net; - return 301 https://ha.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name ha.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 ha.zerolabs.sh; return 301 https://ha.zerolabs.sh$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/hat.conf b/linux/nginx/etc/nginx/conf.d/hat.conf index 584dad6..0d2f50f 100644 --- a/linux/nginx/etc/nginx/conf.d/hat.conf +++ b/linux/nginx/etc/nginx/conf.d/hat.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name hat.zerolabs.sh; + return 301 https://hat.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/hn.conf b/linux/nginx/etc/nginx/conf.d/hn.conf index 9fe8c59..94a1c9e 100644 --- a/linux/nginx/etc/nginx/conf.d/hn.conf +++ b/linux/nginx/etc/nginx/conf.d/hn.conf @@ -14,6 +14,13 @@ server { location / { try_files $uri $uri/ /index.html; } } +server { + listen 80; + listen [::]:80; + server_name hn.zerolabs.sh; + return 301 https://hn.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/irc.conf b/linux/nginx/etc/nginx/conf.d/irc.conf index a8fb8d4..1d3dac4 100644 --- a/linux/nginx/etc/nginx/conf.d/irc.conf +++ b/linux/nginx/etc/nginx/conf.d/irc.conf @@ -20,19 +20,6 @@ server { server { listen 80; listen [::]:80; - server_name irc.cleberg.net; - return 301 https://irc.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name irc.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 irc.zerolabs.sh; return 301 https://irc.zerolabs.sh$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/ld.conf b/linux/nginx/etc/nginx/conf.d/ld.conf index dd7e2a8..53efa9e 100644 --- a/linux/nginx/etc/nginx/conf.d/ld.conf +++ b/linux/nginx/etc/nginx/conf.d/ld.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name ld.zerolabs.sh; + return 301 https://ld.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/lt.conf b/linux/nginx/etc/nginx/conf.d/lt.conf index cf9e368..da29855 100644 --- a/linux/nginx/etc/nginx/conf.d/lt.conf +++ b/linux/nginx/etc/nginx/conf.d/lt.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name lt.zerolabs.sh; + return 301 https://lt.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/mz.conf b/linux/nginx/etc/nginx/conf.d/mz.conf index bd25b7c..4e72d77 100644 --- a/linux/nginx/etc/nginx/conf.d/mz.conf +++ b/linux/nginx/etc/nginx/conf.d/mz.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name mz.zerolabs.sh; + return 301 https://mz.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/office.conf b/linux/nginx/etc/nginx/conf.d/office.conf index 011abd8..dfd3718 100644 --- a/linux/nginx/etc/nginx/conf.d/office.conf +++ b/linux/nginx/etc/nginx/conf.d/office.conf @@ -19,6 +19,13 @@ server { location / { try_files $uri $uri/ /index.html; } } +server { + listen 80; + listen [::]:80; + server_name office.zerolabs.sh; + return 301 https://office.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/org.conf b/linux/nginx/etc/nginx/conf.d/org.conf index fe49aa6..f01e598 100644 --- a/linux/nginx/etc/nginx/conf.d/org.conf +++ b/linux/nginx/etc/nginx/conf.d/org.conf @@ -19,6 +19,13 @@ server { location / { try_files $uri $uri/ /index.html; } } +server { + listen 80; + listen [::]:80; + server_name org.zerolabs.sh; + return 301 https://org.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/paste.conf b/linux/nginx/etc/nginx/conf.d/paste.conf index de63c79..565618e 100644 --- a/linux/nginx/etc/nginx/conf.d/paste.conf +++ b/linux/nginx/etc/nginx/conf.d/paste.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name paste.zerolabs.sh; + return 301 https://paste.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/pb.conf b/linux/nginx/etc/nginx/conf.d/pb.conf index 81ee5fa..6291c9a 100644 --- a/linux/nginx/etc/nginx/conf.d/pb.conf +++ b/linux/nginx/etc/nginx/conf.d/pb.conf @@ -20,6 +20,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name pb.zerolabs.sh; + return 301 https://pb.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/photos.conf b/linux/nginx/etc/nginx/conf.d/photos.conf index 9378ec4..da27b46 100644 --- a/linux/nginx/etc/nginx/conf.d/photos.conf +++ b/linux/nginx/etc/nginx/conf.d/photos.conf @@ -2,7 +2,7 @@ server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name photos.zerolabs.sh; + server_name photos.cleberg.net; include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_strict.conf; @@ -26,18 +26,5 @@ server { listen 80; listen [::]:80; server_name photos.cleberg.net; - return 301 https://photos.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name photos.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://photos.zerolabs.sh$request_uri; + return 301 https://photos.cleberg.net$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/pin.conf b/linux/nginx/etc/nginx/conf.d/pin.conf index 405b76c..aaa4a31 100644 --- a/linux/nginx/etc/nginx/conf.d/pin.conf +++ b/linux/nginx/etc/nginx/conf.d/pin.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name pin.zerolabs.sh; + return 301 https://pin.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/piped.conf b/linux/nginx/etc/nginx/conf.d/piped.conf index 549cf8b..218fdbb 100644 --- a/linux/nginx/etc/nginx/conf.d/piped.conf +++ b/linux/nginx/etc/nginx/conf.d/piped.conf @@ -19,7 +19,14 @@ server { server { listen 80; listen [::]:80; - server_name pipedapi.cleberg.net; + server_name pipedapi.zerolabs.sh; + return 301 https://pipedapi.zerolabs.sh$request_uri; +} + +server { + listen 80; + listen [::]:80; + server_name piped.cleberg.net pipedapi.cleberg.net pipedproxy.cleberg.net; return 301 https://pipedapi.zerolabs.sh$request_uri; } @@ -27,7 +34,7 @@ server { listen 443 ssl; listen [::]:443 ssl; http2 on; - server_name pipedapi.cleberg.net; + server_name piped.cleberg.net pipedapi.cleberg.net pipedproxy.cleberg.net; include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; diff --git a/linux/nginx/etc/nginx/conf.d/projects.conf b/linux/nginx/etc/nginx/conf.d/projects.conf index 789a2c9..fa50125 100644 --- a/linux/nginx/etc/nginx/conf.d/projects.conf +++ b/linux/nginx/etc/nginx/conf.d/projects.conf @@ -22,6 +22,13 @@ server { location / { try_files $uri $uri/ /index.html; } } +server { + listen 80; + listen [::]:80; + server_name projects.zerolabs.sh; + return 301 https://projects.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/rd.conf b/linux/nginx/etc/nginx/conf.d/rd.conf index b1e125d..c8e9d53 100644 --- a/linux/nginx/etc/nginx/conf.d/rd.conf +++ b/linux/nginx/etc/nginx/conf.d/rd.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name rd.zerolabs.sh; + return 301 https://rd.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/rimgo.conf b/linux/nginx/etc/nginx/conf.d/rimgo.conf index 8d89400..bbbd87e 100644 --- a/linux/nginx/etc/nginx/conf.d/rimgo.conf +++ b/linux/nginx/etc/nginx/conf.d/rimgo.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name rimgo.zerolabs.sh; + return 301 https://rimgo.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/rl.conf b/linux/nginx/etc/nginx/conf.d/rl.conf index 103bb38..5750216 100644 --- a/linux/nginx/etc/nginx/conf.d/rl.conf +++ b/linux/nginx/etc/nginx/conf.d/rl.conf @@ -18,6 +18,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name rl.zerolabs.sh; + return 301 https://rl.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/rss.conf b/linux/nginx/etc/nginx/conf.d/rss.conf index 98a1d3f..ede1e68 100644 --- a/linux/nginx/etc/nginx/conf.d/rss.conf +++ b/linux/nginx/etc/nginx/conf.d/rss.conf @@ -28,19 +28,6 @@ server { server { listen 80; listen [::]:80; - server_name rss.cleberg.net; - return 301 https://rss.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name rss.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 rss.zerolabs.sh; return 301 https://rss.zerolabs.sh$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/search.conf b/linux/nginx/etc/nginx/conf.d/search.conf index 1dae98e..986d66a 100644 --- a/linux/nginx/etc/nginx/conf.d/search.conf +++ b/linux/nginx/etc/nginx/conf.d/search.conf @@ -20,6 +20,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name search.zerolabs.sh; + return 301 https://search.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/send.conf b/linux/nginx/etc/nginx/conf.d/send.conf index ce69bc7..114afac 100644 --- a/linux/nginx/etc/nginx/conf.d/send.conf +++ b/linux/nginx/etc/nginx/conf.d/send.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name send.zerolabs.sh; + return 301 https://send.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/slash.conf b/linux/nginx/etc/nginx/conf.d/slash.conf index 7cd2159..e94a1fe 100644 --- a/linux/nginx/etc/nginx/conf.d/slash.conf +++ b/linux/nginx/etc/nginx/conf.d/slash.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name slash.zerolabs.sh; + return 301 https://slash.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/small.conf b/linux/nginx/etc/nginx/conf.d/small.conf index ea365eb..c956e48 100644 --- a/linux/nginx/etc/nginx/conf.d/small.conf +++ b/linux/nginx/etc/nginx/conf.d/small.conf @@ -16,6 +16,13 @@ server { include custom.d/security/robots_index_only.conf; } +server { + listen 80; + listen [::]:80; + server_name small.zerolabs.sh; + return 301 https://small.zerolabs.sh$request_uri; +} + server { listen 80; listen [::]:80; diff --git a/linux/nginx/etc/nginx/conf.d/ssh.conf b/linux/nginx/etc/nginx/conf.d/ssh.conf index 812396f..4ffc9aa 100644 --- a/linux/nginx/etc/nginx/conf.d/ssh.conf +++ b/linux/nginx/etc/nginx/conf.d/ssh.conf @@ -20,19 +20,6 @@ server { server { listen 80; listen [::]:80; - server_name ssh.cleberg.net; - return 301 https://ssh.zerolabs.sh$request_uri; -} - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - server_name ssh.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 ssh.zerolabs.sh; return 301 https://ssh.zerolabs.sh$request_uri; } -- cgit v1.2.3