From 093083cfa58ad0b27c689f44f419a89194370560 Mon Sep 17 00:00:00 2001
From: Naglfar <naglfar@tilde.team>
Date: Wed, 29 Sep 2021 13:04:56 +0200
Subject: [PATCH] Update to the working config

---
 .../apache2/sites-available/thunix.net.conf   | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
index bc717c3..f9be4b1 100644
--- a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
@@ -9,32 +9,5 @@
 		Order deny,allow
 		Deny from all
 	</Directorymatch>
-RewriteEngine on
-RewriteCond %{SERVER_NAME} =thunix.net
-RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+    Redirect permanent / https://thunix.net/
 </VirtualHost>
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin webmaster@thunix.net
-    ServerName thunix.net
-    ServerAlias thunixme5v4rnoby.onion
-    DocumentRoot /var/www/thunix.cf
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-RewriteEngine on
-# Some rewrite rules in this file were disabled on your HTTPS site,
-# because they have the potential to create redirection loops.
-
- RewriteCond %{SERVER_NAME} =thunix.net
- RewriteRule ^ https://www.%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
-
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/thunix.net-0001/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/thunix.net-0001/privkey.pem
-
-</VirtualHost>
-</IfModule>