From 87e613a0ff350d07681afa1ce8d2c06d91b3f6d6 Mon Sep 17 00:00:00 2001
From: Anton McClure <amcclure@ttm.sh>
Date: Mon, 28 Jan 2019 11:10:56 -0500
Subject: [PATCH 1/3] Add
 'roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf'

---
 .../etc/apache2/sites-available/ftp.thunix.cf.conf    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf

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
new file mode 100644
index 0000000..9d70d4c
--- /dev/null
+++ b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf
@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+    ServerAdmin amcclure@ttm.sh
+    ServerName thunix.cf
+    DocumentRoot /var/www/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

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 2/3] 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

From 5b654d338e094e5853764fd6006ab8b268f312a5 Mon Sep 17 00:00:00 2001
From: Anton McClure <amcclure@ttm.sh>
Date: Mon, 28 Jan 2019 11:13:56 -0500
Subject: [PATCH 3/3] Update 'roles/webserver/tasks/apache.yml'

---
 roles/webserver/tasks/apache.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml
index 78607f3..f9d38dd 100644
--- a/roles/webserver/tasks/apache.yml
+++ b/roles/webserver/tasks/apache.yml
@@ -92,6 +92,11 @@
     src: ../files/etc/apache2/sites-available/you.wer.ee.conf
     dest: /etc/apache2/sites-available/you.wer.ee.conf
 
+- name: Deploy Apache2 Site Config ftp.thunix.cf.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/ftp.thunix.cf.conf
+    dest: /etc/apache2/sites-available/ftp.thunix.cf.conf
+
 ##Mods
 
 #- name: Deploy Apache2 Module Config php7.0.conf