From 678e3a774b02732e816563d3238542b58160892f Mon Sep 17 00:00:00 2001
From: Anton McClure <amcclure@ttm.sh>
Date: Mon, 28 Jan 2019 11:12:36 -0500
Subject: [PATCH] Update
 'roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf'

---
 .../sites-available/ftp.thunix.cf.conf        | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf
index 9d70d4c..5251955 100644
--- a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf
+++ b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf
@@ -1,11 +1,28 @@
 <VirtualHost *:80>
     ServerAdmin amcclure@ttm.sh
-    ServerName thunix.cf
-    DocumentRoot /var/www/thunix.cf
+    ServerName ftp.thunix.cf
+    DocumentRoot /var/www/ftp.thunix.cf
     ErrorLog ${APACHE_LOG_DIR}/error.log
     CustomLog ${APACHE_LOG_DIR}/access.log combined
     <Directorymatch "^/.*/\.git/">
-		Order deny,allow
-		Deny from all
-	</Directorymatch>
-</VirtualHost>
\ No newline at end of file
+                Order deny,allow
+                Deny from all
+        </Directorymatch>
+</VirtualHost>
+
+    <IfModule mod_ssl.c>
+    <VirtualHost *:443>
+    ServerAdmin amcclure@ttm.sh
+    ServerName ftp.thunix.cf
+    DocumentRoot /var/www/ftp.thunix.cf
+    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/ftp.thunix.cf/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
+    Include /etc/letsencrypt/options-ssl-apache.conf
+    </VirtualHost>
+    </IfModule>
\ No newline at end of file