From e43b59e0ac4b85f4eb7548e3b3bdf0b48886582e Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Wed, 28 Jun 2023 19:11:46 +0000
Subject: [PATCH] Update
 'roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf'

---
 .../sites-available/www.thunix.net.conf       | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 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 5ed0504..d1b8875 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
@@ -1,6 +1,8 @@
 <VirtualHost *:80 *:443>
     ServerAdmin webmaster@thunix.net
     ServerName www.thunix.net
+    SSLEngine on
+    ServerAlias i5pmp326di6rgydkk4vzjbevncwkdreli2aak72btpg7sofhsadqqeid.onion thunix.tilde
     DocumentRoot /var/www/thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
     CustomLog ${APACHE_LOG_DIR}/access.log combined
@@ -10,20 +12,13 @@
         Require all granted
     </Directory>
     <Directorymatch "^/.*/\.git/">
-                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>
-        </IfModule>
-#    Redirect permanent / https://www.thunix.net/
-#Include /etc/letsencrypt/options-ssl-apache.conf
-SSLCertificateFile /etc/letsencrypt/live/thunix.net/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/thunix.net/privkey.pem
+        Order deny,allow
+        Deny from all
+    </Directorymatch>
+    RewriteEngine On
+    # Redirect permanent / https://thunix.net
+
+    SSLCertificateFile "/etc/letsencrypt/live/thunix.net/cert.pem"
+    SSLCertificateChainFile "/etc/letsencrypt/live/thunix.net/fullchain.pem"
+    SSLCertificateKeyFile "/etc/letsencrypt/live/thunix.net/privkey.pem"
 </VirtualHost>
\ No newline at end of file