From f392622c5396a63d44d5ea32197e121531c74e6d Mon Sep 17 00:00:00 2001
From: Ubergeek <ubergeek@yourtilde.com>
Date: Sat, 22 Feb 2020 21:41:39 -0500
Subject: [PATCH] Updating the apache conf for www.thunix

---
 .../sites-available/www.thunix.net.conf       | 35 ++-----------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf
index cd776a23..da35611f 100644
--- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf
@@ -18,37 +18,6 @@
                Require method GET POST OPTIONS
        </Directory>
 	</IfModule>
+    Redirect permanent / https://thunix.net/
+
 </VirtualHost>
-<IfModule mod_ssl.c>
-<VirtualHost *:443>
-    ServerAdmin webmaster@thunix.net
-    ServerName www.thunix.net
-    DocumentRoot /var/www/thunix.cf
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-    <Directorymatch "^/.*/\.git/">
-		AllowOverride All
-                Order deny,allow
-                Deny from all
-        </Directorymatch>
-    <IfModule mod_userdir.c>
-       UserDir public_html
-       UserDir disabled root
-       <Directory /home/*/public_html>
-               AllowOverride FileInfo AuthConfig Limit Indexes
-               Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-               Require method GET POST OPTIONS
-       </Directory>
-    <Directory /var/www/thunix.cf>
-            Options Indexes FollowSymLinks MultiViews
-            # changed from None to FileInfo
-            AllowOverride FileInfo
-            Order allow,deny
-            allow from all
-    </Directory>
-	</IfModule>
-Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/www.thunix.net/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/www.thunix.net/privkey.pem
-</VirtualHost>
-</IfModule>