From 9683592cbc9837e89c3854965f4bba09223d44a0 Mon Sep 17 00:00:00 2001
From: Viyurz <128215328+Viyurz@users.noreply.github.com>
Date: Wed, 13 Dec 2023 15:11:38 +0100
Subject: [PATCH] nginx-rp: Reorder servers by alphabetical order

---
 nginx-rp/reverse-proxy.conf | 215 +++++++++++++++++-------------------
 1 file changed, 102 insertions(+), 113 deletions(-)

diff --git a/nginx-rp/reverse-proxy.conf b/nginx-rp/reverse-proxy.conf
index fbb4c34..0a9959b 100644
--- a/nginx-rp/reverse-proxy.conf
+++ b/nginx-rp/reverse-proxy.conf
@@ -9,7 +9,6 @@ server {
 }
 
 
-
 # Default HTTPS server
 server {
 	listen 443 ssl http2 default_server;
@@ -22,6 +21,92 @@ server {
 }
 
 
+# Base domain redirect
+server {
+	listen 443 ssl http2;
+	listen [::]:443 ssl http2;
+
+	server_name viyurz.fr;
+
+	location = /.well-known/matrix/server {
+		default_type application/json;
+		return 200 '{ "m.server": "matrix.viyurz.fr:443" }';
+	}
+
+	location = /.well-known/matrix/client {
+		default_type application/json;
+		add_header Access-Control-Allow-Origin '*';
+		add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
+		add_header Set-Cookie "Path=/; HttpOnly; Secure";
+		return 200 '{ "m.homeserver": { "base_url": "https://matrix.viyurz.fr" } }';
+	}
+
+	location / {
+		return 308 https://www.viyurz.fr$request_uri;
+	}
+}
+
+
+# Homepage
+server {
+	listen 443 ssl http2;
+	listen [::]:443 ssl http2;
+
+	server_name www.viyurz.fr;
+
+	location / {
+		proxy_pass http://localhost:8082;
+	}
+}
+
+
+# Element
+server {
+	listen 443 ssl http2;
+	listen [::]:443 ssl http2;
+
+	server_name element.viyurz.fr;
+
+	location / {
+		proxy_pass http://localhost:8084;
+
+		add_header X-Frame-Options SAMEORIGIN;
+		add_header X-Content-Type-Options nosniff;
+		add_header X-XSS-Protection "1; mode=block";
+		add_header Content-Security-Policy "frame-ancestors 'none'";
+	
+		add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
+		add_header X-Robots-Tag "noindex, nofollow" always;
+		add_header Set-Cookie "Path=/; HttpOnly; Secure";
+	}
+}
+
+
+# Etebase
+server {
+	listen 443 ssl http2;
+	listen [::]:443 ssl http2;
+
+	server_name etebase.viyurz.fr;
+	
+	location ~ ^/(?!admin) {
+		proxy_pass http://localhost:3735;
+	}
+}
+
+
+# Kavita
+server {
+	listen 443 ssl http2;
+	listen [::]:443 ssl http2;
+
+	server_name kavita.viyurz.fr;
+
+	location / {
+		proxy_pass http://localhost:5000;
+	}
+}
+
 
 # Nextcloud
 server {
@@ -48,33 +133,6 @@ server {
 }
 
 
-
-# Vaultwarden
-upstream vaultwarden-default {
-	zone vaultwarden-default 64k;
-	server localhost:8081;
-	keepalive 2;
-}
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;	
-	
-	server_name vw.viyurz.fr;
-
-	location / {
-		proxy_pass http://vaultwarden-default;
-		
-		# Websocket
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade $http_upgrade;
-		proxy_set_header Connection $connection_upgrade;
-
-		client_max_body_size 525M;
-	}
-}
-
-
-
 # SearxNG
 server {
 	listen 443 ssl http2;
@@ -92,8 +150,7 @@ server {
 }
 
 
-
-# Matrix/Synapse
+# Synapse
 server {
 	listen 443 ssl http2;
 	listen [::]:443 ssl http2;
@@ -110,7 +167,6 @@ server {
 }
 
 
-
 # Syncthing Discovery
 upstream stdisco.viyurz.fr {
 	# Local IP address:port for discovery server
@@ -135,93 +191,26 @@ server {
 }
 
 
-
-# Etebase
+# Vaultwarden
+upstream vaultwarden-default {
+	zone vaultwarden-default 64k;
+	server localhost:8081;
+	keepalive 2;
+}
 server {
 	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-
-	server_name etebase.viyurz.fr;
+	listen [::]:443 ssl http2;	
 	
-	location ~ ^/(?!admin) {
-		proxy_pass http://localhost:3735;
-	}
-}
-
-
-
-# Element
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-
-	server_name element.viyurz.fr;
+	server_name vw.viyurz.fr;
 
 	location / {
-		proxy_pass http://localhost:8084;
+		proxy_pass http://vaultwarden-default;
+		
+		# Websocket
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection $connection_upgrade;
 
-		add_header X-Frame-Options SAMEORIGIN;
-		add_header X-Content-Type-Options nosniff;
-		add_header X-XSS-Protection "1; mode=block";
-		add_header Content-Security-Policy "frame-ancestors 'none'";
-	
-		add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
-		add_header X-Robots-Tag "noindex, nofollow" always;
-		add_header Set-Cookie "Path=/; HttpOnly; Secure";
-	}
-}
-
-
-
-# Kavita
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-
-	server_name kavita.viyurz.fr;
-
-	location / {
-		proxy_pass http://localhost:5000;
-	}
-}
-
-
-
-# Homepage
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-
-	server_name www.viyurz.fr;
-
-	location / {
-		proxy_pass http://localhost:8082;
-	}
-}
-
-
-
-# Base domain redirect
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-
-	server_name viyurz.fr;
-
-	location = /.well-known/matrix/server {
-		default_type application/json;
-		return 200 '{ "m.server": "matrix.viyurz.fr:443" }';
-	}
-
-	location = /.well-known/matrix/client {
-		default_type application/json;
-		add_header Access-Control-Allow-Origin '*';
-		add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
-		add_header Set-Cookie "Path=/; HttpOnly; Secure";
-		return 200 '{ "m.homeserver": { "base_url": "https://matrix.viyurz.fr" } }';
-	}
-
-	location / {
-		return 308 https://www.viyurz.fr$request_uri;
+		client_max_body_size 525M;
 	}
 }