From 56c8d21036fca02fa6d8b43f8e4dbe171e88ae2e Mon Sep 17 00:00:00 2001
From: Ubergeek <ubergeek@yourtilde.com>
Date: Sun, 10 Feb 2019 03:53:27 +0000
Subject: [PATCH] Adding thunix.net to system configs

---
 .../apache2/sites-available/thunix.net.conf   | 11 ++++++
 .../sites-available/www.thunix.net.conf       | 11 ++++++
 roles/webserver/tasks/apache.yml              | 38 ++++---------------
 3 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
 create mode 100644 roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf

diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
new file mode 100644
index 0000000..95619fd
--- /dev/null
+++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf
@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+    ServerAdmin webmaster@thunix.net 
+    ServerName thunix.net
+    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>
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
new file mode 100644
index 0000000..b016c6e
--- /dev/null
+++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf
@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+    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
+    <Directorymatch "^/.*/\.git/">
+		Order deny,allow
+		Deny from all
+	</Directorymatch>
+</VirtualHost>
diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml
index b6a1bac..6285ef2 100644
--- a/roles/webserver/tasks/apache.yml
+++ b/roles/webserver/tasks/apache.yml
@@ -23,11 +23,6 @@
     src: ../files/etc/apache2/sites-available/mail.thunix.cf.conf
     dest: /etc/apache2/sites-available/mail.thunix.cf.conf
 
-#- name: Deploy Apache2 Site Config mail.thunix.cf-le-ssl.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf
-
 - name: Deploy Apache2 Site Config ny.dyniform.net.conf
   copy:
     src: ../files/etc/apache2/sites-available/ny.dyniform.net.conf
@@ -38,31 +33,16 @@
     src: ../files/etc/apache2/sites-available/thunix.cf.conf
     dest: /etc/apache2/sites-available/thunix.cf.conf
 
-#- name: Deploy Apache2 Site Config thunix.cf-le-ssl.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/thunix.cf-le-ssl.conf
-
 - name: Deploy Apache2 Site Config thunix.tilde.chat.conf
   copy:
     src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf
     dest: /etc/apache2/sites-available/thunix.tilde.chat.conf
 
-#- name: Deploy Apache2 Site Config thunix.tilde.chat.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf
-#    dest: /etc/apache2/sites-available/thunix.tilde.chat.conf
-
 - name: Deploy Apache2 Site Config www.thunix.cf.conf
   copy:
     src: ../files/etc/apache2/sites-available/www.thunix.cf.conf
     dest: /etc/apache2/sites-available/www.thunix.cf.conf
 
-#- name: Deploy Apache2 Site Config www.thunix.cf-le-ssl.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
-
 - name: Deploy Apache2 Site Config amcclure.cf.conf
   copy:
     src: ../files/etc/apache2/sites-available/amcclure.cf.conf
@@ -73,11 +53,6 @@
     src: ../files/etc/apache2/sites-available/www.amcclure.cf.conf
     dest: /etc/apache2/sites-available/www.amcclure.cf.conf
 
-#- name: Deploy Apache2 Site Config amcclure.cf.conf
-#  copy:
-#    src: ../files/etc/apache2/sites-available/amcclure.cf-le-ssl.conf
-#    dest: /etc/apache2/sites-available/amcclure.cf-le-ssl.conf
-
 - name: Deploy Apache2 Site Config amcclure.tilde.conf
   copy:
     src: ../files/etc/apache2/sites-available/amcclure.tilde.conf
@@ -103,9 +78,12 @@
     src: ../files/etc/apache2/sites-available/ftp.thunix.cf.conf
     dest: /etc/apache2/sites-available/ftp.thunix.cf.conf
 
-##Mods
+- name: Deploy Apache2 Site Config thunix.net.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/thunix.net.conf
+    dest: /etc/apache2/sites-available/thunix.net.conf
 
-#- name: Deploy Apache2 Module Config php7.0.conf
-#  copy:
-#    src: ../files/etc/apache2/mods-available/php7.0.conf
-#    dest: /etc/apache2/mods-available/php7.0.conf
+- name: Deploy Apache2 Site Config www.thunix.net.conf
+  copy:
+    src: ../files/etc/apache2/sites-available/www.thunix.net.conf
+    dest: /etc/apache2/sites-available/www.thunix.net.conf