Merge branch 'thunix-ftp' of thunix/ansible into master

roles/webserver/files/etc/apache2/sites-available/ftp.thunix.cf.conf

@@ -0,0 +1,28 @@
+<VirtualHost *:80>
+    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>
+</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>

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