From d9f03fd1ac12402d075da3e1f9937cbc2bb7772f Mon Sep 17 00:00:00 2001
From: Anton McClure <amcclure@thunix.net>
Date: Sat, 25 May 2019 10:57:21 -0400
Subject: [PATCH] created certs and enabled ssl for forums.thunix.net,
 git.thunix.net, and lists.thunix.net

---
 .../sites-available/forums.thunix.net.conf    | 34 +++++++++----------
 .../sites-available/git.thunix.net.conf       | 32 ++++++++---------
 .../sites-available/lists.thunix.net.conf     | 32 ++++++++---------
 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/roles/webserver/files/etc/apache2/sites-available/forums.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/forums.thunix.net.conf
index d333e4f..00ce2f1 100644
--- a/roles/webserver/files/etc/apache2/sites-available/forums.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/forums.thunix.net.conf
@@ -11,20 +11,20 @@
         </Directorymatch>
 </VirtualHost>
 
-#<IfModule mod_ssl.c>
-#    <VirtualHost *:443>
-#    ServerAdmin webmaster@thunix.net
-#    ServerName forums.thunix.net
-#    ServerAlias forums.thunixme5v4rnoby.onion
-#    DocumentRoot /var/www/forums.thunix.net
-#    ErrorLog ${APACHE_LOG_DIR}/error.log
-#    CustomLog ${APACHE_LOG_DIR}/access.log combined
-#    <Directorymatch "^/.*/\.git/">
-#                Order deny,allow
-#                Deny from all
-#        </Directorymatch>
-#    SSLCertificateFile /etc/letsencrypt/live/forums.thunix.net/fullchain.pem
-#    SSLCertificateKeyFile /etc/letsencrypt/live/forums.thunix.net/privkey.pem
-#    Include /etc/letsencrypt/options-ssl-apache.conf
-#</VirtualHost>
-#</IfModule>
+<IfModule mod_ssl.c>
+    <VirtualHost *:443>
+    ServerAdmin webmaster@thunix.net
+    ServerName forums.thunix.net
+    ServerAlias forums.thunixme5v4rnoby.onion
+    DocumentRoot /var/www/forums.thunix.net
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    <Directorymatch "^/.*/\.git/">
+                Order deny,allow
+                Deny from all
+        </Directorymatch>
+    SSLCertificateFile /etc/letsencrypt/live/forums.thunix.net/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/forums.thunix.net/privkey.pem
+    Include /etc/letsencrypt/options-ssl-apache.conf
+</VirtualHost>
+</IfModule>
diff --git a/roles/webserver/files/etc/apache2/sites-available/git.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/git.thunix.net.conf
index 43138f8..90ccbfc 100644
--- a/roles/webserver/files/etc/apache2/sites-available/git.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/git.thunix.net.conf
@@ -11,19 +11,19 @@
         </Directorymatch>
 </VirtualHost>
 
-#<IfModule mod_ssl.c>
-#    <VirtualHost *:443>
-#    ServerAdmin webmaster@thunix.net
-#    ServerName git.thunix.net
-#    DocumentRoot /var/www/git.thunix.net
-#    ErrorLog ${APACHE_LOG_DIR}/error.log
-#    CustomLog ${APACHE_LOG_DIR}/access.log combined
-#    <Directorymatch "^/.*/\.git/">
-#                Order deny,allow
-#                Deny from all
-#        </Directorymatch>
-#    SSLCertificateFile /etc/letsencrypt/live/git.thunix.net/fullchain.pem
-#    SSLCertificateKeyFile /etc/letsencrypt/live/git.thunix.net/privkey.pem
-#    Include /etc/letsencrypt/options-ssl-apache.conf
-#</VirtualHost>
-#</IfModule>
+<IfModule mod_ssl.c>
+    <VirtualHost *:443>
+    ServerAdmin webmaster@thunix.net
+    ServerName git.thunix.net
+    DocumentRoot /var/www/git.thunix.net
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    <Directorymatch "^/.*/\.git/">
+                Order deny,allow
+                Deny from all
+        </Directorymatch>
+    SSLCertificateFile /etc/letsencrypt/live/git.thunix.net/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/git.thunix.net/privkey.pem
+    Include /etc/letsencrypt/options-ssl-apache.conf
+</VirtualHost>
+</IfModule>
diff --git a/roles/webserver/files/etc/apache2/sites-available/lists.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/lists.thunix.net.conf
index 5a48f10..52d8e3d 100644
--- a/roles/webserver/files/etc/apache2/sites-available/lists.thunix.net.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/lists.thunix.net.conf
@@ -11,19 +11,19 @@
         </Directorymatch>
 </VirtualHost>
 
-#<IfModule mod_ssl.c>
-#    <VirtualHost *:443>
-#    ServerAdmin webmaster@thunix.net
-#    ServerName lists.thunix.net
-#    DocumentRoot /var/www/lists.thunix.net
-#    ErrorLog ${APACHE_LOG_DIR}/error.log
-#    CustomLog ${APACHE_LOG_DIR}/access.log combined
-#    <Directorymatch "^/.*/\.git/">
-#                Order deny,allow
-#                Deny from all
-#        </Directorymatch>
-#    SSLCertificateFile /etc/letsencrypt/live/lists.thunix.net/fullchain.pem
-#    SSLCertificateKeyFile /etc/letsencrypt/live/lists.thunix.net/privkey.pem
-#    Include /etc/letsencrypt/options-ssl-apache.conf
-#</VirtualHost>
-#</IfModule>
+<IfModule mod_ssl.c>
+    <VirtualHost *:443>
+    ServerAdmin webmaster@thunix.net
+    ServerName lists.thunix.net
+    DocumentRoot /var/www/lists.thunix.net
+    ErrorLog ${APACHE_LOG_DIR}/error.log
+    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    <Directorymatch "^/.*/\.git/">
+                Order deny,allow
+                Deny from all
+        </Directorymatch>
+    SSLCertificateFile /etc/letsencrypt/live/lists.thunix.net/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/lists.thunix.net/privkey.pem
+    Include /etc/letsencrypt/options-ssl-apache.conf
+</VirtualHost>
+</IfModule>