From 01b938ec5a26cff15c1a34e8d895ad06247dd6e8 Mon Sep 17 00:00:00 2001
From: phantom <phantom@shadeouts.net>
Date: Wed, 14 Aug 2024 14:58:47 -0500
Subject: [PATCH] Upgrade all HTTP requests in one place

---
 nginx/conf.d/4get.conf                                   | 7 -------
 nginx/conf.d/datamining.conf                             | 7 -------
 nginx/conf.d/git.conf                                    | 7 -------
 nginx/conf.d/inv.conf                                    | 7 -------
 nginx/conf.d/keygenmusic.conf                            | 6 ------
 nginx/conf.d/luna.conf                                   | 7 -------
 nginx/conf.d/materialious.conf                           | 7 -------
 nginx/conf.d/pbin.conf                                   | 7 -------
 nginx/conf.d/peertube.conf                               | 7 -------
 nginx/conf.d/{zzls-xyz-redirect.conf => redirector.conf} | 7 +++++++
 10 files changed, 7 insertions(+), 62 deletions(-)
 rename nginx/conf.d/{zzls-xyz-redirect.conf => redirector.conf} (68%)

diff --git a/nginx/conf.d/4get.conf b/nginx/conf.d/4get.conf
index 5686a37..a8c6c9c 100644
--- a/nginx/conf.d/4get.conf
+++ b/nginx/conf.d/4get.conf
@@ -70,10 +70,3 @@ server {
     return 301 $1;
   }
 }
-
-server {
-  listen 80;
-  server_name 4get.nadeko.net;
-
-  return 301 https://4get.nadeko.net$request_uri;
-}
diff --git a/nginx/conf.d/datamining.conf b/nginx/conf.d/datamining.conf
index a0e9051..5eb2351 100644
--- a/nginx/conf.d/datamining.conf
+++ b/nginx/conf.d/datamining.conf
@@ -17,10 +17,3 @@ server {
   listen 443 ssl;
   http2 on;
 }
-
-server {
-  listen 80;
-  server_name datamining.nadeko.net;
-
-  return 301 https://$host$request_uri;
-}
diff --git a/nginx/conf.d/git.conf b/nginx/conf.d/git.conf
index 70d15f0..a2aac47 100644
--- a/nginx/conf.d/git.conf
+++ b/nginx/conf.d/git.conf
@@ -19,10 +19,3 @@ server {
   http2 on;
 
 }
-
-server {
-  listen 80;
-  server_name git.nadeko.net;
-
-  return 301 https://git.nadeko.net$request_uri;
-}
diff --git a/nginx/conf.d/inv.conf b/nginx/conf.d/inv.conf
index b57b386..28d2257 100644
--- a/nginx/conf.d/inv.conf
+++ b/nginx/conf.d/inv.conf
@@ -38,10 +38,3 @@ server {
 
 	include conf.d/inv.conf.locations;
 }
-
-server {
-  listen 80;
-  server_name inv.nadeko.net;
-
-  return 301 https://inv.nadeko.net$request_uri;
-}
diff --git a/nginx/conf.d/keygenmusic.conf b/nginx/conf.d/keygenmusic.conf
index 607de9d..82fb3e1 100644
--- a/nginx/conf.d/keygenmusic.conf
+++ b/nginx/conf.d/keygenmusic.conf
@@ -29,9 +29,3 @@ server {
 	http2 on;
 }
 
-server {
-  listen 80;
-  server_name keygenmusic.nadeko.net;
-
-  return 301 https://$host$request_uri;
-}
diff --git a/nginx/conf.d/luna.conf b/nginx/conf.d/luna.conf
index 6a9b556..f170d7b 100644
--- a/nginx/conf.d/luna.conf
+++ b/nginx/conf.d/luna.conf
@@ -30,10 +30,3 @@ server {
   http2 on;
 
 }
-
-server {
-  listen 80;
-  server_name luna.nadeko.net;
-
-  return 301 https://luna.nadeko.net$request_uri;
-}
diff --git a/nginx/conf.d/materialious.conf b/nginx/conf.d/materialious.conf
index 28f4c5a..63d48a8 100644
--- a/nginx/conf.d/materialious.conf
+++ b/nginx/conf.d/materialious.conf
@@ -70,10 +70,3 @@ server {
   listen 443 ssl;
   http2 on;
 }
-
-server {
-  listen 80;
-  server_name materialious.nadeko.net syncious.nadeko.net peerjs.nadeko.net;
-
-  return 301 https://$host$request_uri;
-}
diff --git a/nginx/conf.d/pbin.conf b/nginx/conf.d/pbin.conf
index d54356f..da4371c 100644
--- a/nginx/conf.d/pbin.conf
+++ b/nginx/conf.d/pbin.conf
@@ -18,10 +18,3 @@ server {
   http2 on;
 
 }
-
-server {
-  listen 80;
-  server_name pbin.zzls.xyz pbin.nadeko.net;
-
-  return 301 https://pbin.nadeko.net$request_uri;
-}
\ No newline at end of file
diff --git a/nginx/conf.d/peertube.conf b/nginx/conf.d/peertube.conf
index 35f0d6d..97756e7 100644
--- a/nginx/conf.d/peertube.conf
+++ b/nginx/conf.d/peertube.conf
@@ -24,10 +24,3 @@ server {
   listen 443 ssl;
   http2 on;
 }
-
-server {
-  listen 80;
-  server_name peertube.nadeko.net;
-
-  return 301 https://$host$request_uri;
-}
\ No newline at end of file
diff --git a/nginx/conf.d/zzls-xyz-redirect.conf b/nginx/conf.d/redirector.conf
similarity index 68%
rename from nginx/conf.d/zzls-xyz-redirect.conf
rename to nginx/conf.d/redirector.conf
index ff16fdf..32478b4 100644
--- a/nginx/conf.d/zzls-xyz-redirect.conf
+++ b/nginx/conf.d/redirector.conf
@@ -5,3 +5,10 @@ server {
     listen 443 ssl;
     listen 80;
 }
+
+# HTTPS Redirector
+server {
+    listen 80;
+
+    return 301 https://$host$request_uri;
+}
\ No newline at end of file