From b32337b6c5c4ddf7527806d4ac4af5df1b5690ec Mon Sep 17 00:00:00 2001
From: root <root@vern.cc>
Date: Thu, 15 Dec 2022 15:29:10 +0000
Subject: [PATCH] make el.vern.cc alias for riot.vern.cc

---
 common/nextcloud.conf |  2 +-
 conf.d/riot.conf      | 39 +++------------------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/common/nextcloud.conf b/common/nextcloud.conf
index f9f0c19..267648f 100644
--- a/common/nextcloud.conf
+++ b/common/nextcloud.conf
@@ -111,7 +111,7 @@ location ~ \.php(?:$|/) {
 
 	fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
 	fastcgi_param front_controller_active true;     # Enable pretty urls
-	fastcgi_pass unix:/run/php/php8.0-fpm.sock;
+	fastcgi_pass unix:/var/run/php/php8.0-fpm.sock;
 
 	fastcgi_intercept_errors on;
 	fastcgi_request_buffering off;
diff --git a/conf.d/riot.conf b/conf.d/riot.conf
index 89a8be7..b7ef9f8 100644
--- a/conf.d/riot.conf
+++ b/conf.d/riot.conf
@@ -2,7 +2,7 @@ server {
 	listen 80;
 	listen [::]:80;
 
-	server_name riot.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion;
+	server_name riot.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion el.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion;
 
 	include common/riot.conf;
 }
@@ -14,14 +14,13 @@ server {
 	server_name vernltmkmwexhk77dlxmqlet3djveje7gcq7lwy3l5gkemxysy5q.b32.i2p;
 
 	subs_filter_types text/html text/css text/xml application/javascript text/plain;
-	subs_filter 'https://matrix.to' 'http://mto.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion';
 	include common/riot.conf;
 }
 
 server {
 	listen 443 ssl http2;
 	listen [::]:443 ssl http2;
-	server_name riot.vern.cc;
+	server_name riot.vern.cc el.vern.cc;
 	include snippets/lets-encrypt.conf;
 
 	include common/riot.conf;
@@ -30,38 +29,6 @@ server {
 server {
 	listen 80;
 	listen [::]:80;
-	server_name riot.vern.cc;
-	return 301 https://$host$request_uri;
-}
-
-
-
-server {
-	listen 80;
-	listen [::]:80;
-
-	server_name el.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion;
-
-	subs_filter_types text/html text/css text/xml application/javascript text/plain;
-	subs_filter 'https://matrix.to' 'http://mto.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion';
-	include common/riot.conf;
-}
-
-server {
-	listen 443 ssl http2;
-	listen [::]:443 ssl http2;
-	server_name el.vern.cc;
-	include snippets/lets-encrypt.conf;
-
-	subs_filter_types text/html text/css text/xml application/javascript text/plain;
-	subs_filter 'matrix.to' 'mto.vern.cc';
-
-	include common/riot.conf;
-}
-
-server {
-	listen 80;
-	listen [::]:80;
-	server_name el.vern.cc;
+	server_name riot.vern.cc el.vern.cc;
 	return 301 https://$host$request_uri;
 }