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

---
 .../sites-available/www.thunix.net.conf       | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 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 52ae55f..5ed0504 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,13 +1,18 @@
-<VirtualHost *:80>
+<VirtualHost *:80 *: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
+    <Directory /var/www/thunix.cf>
+        Options FollowSymLinks
+        AllowOverride All
+        Require all granted
+    </Directory>
     <Directorymatch "^/.*/\.git/">
-		Order deny,allow
-		Deny from all
-	</Directorymatch>
+                Order deny,allow
+                Deny from all
+        </Directorymatch>
     <IfModule mod_userdir.c>
        UserDir public_html
        UserDir disabled root
@@ -16,7 +21,9 @@
                Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
                Require method GET POST OPTIONS
        </Directory>
-	</IfModule>
-    Redirect permanent / https://www.thunix.net/
-
-</VirtualHost>
+        </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
+</VirtualHost>
\ No newline at end of file