From a55490221e65b714d2cf073b8180a80bc96dfd6b Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Thu, 3 Jan 2019 19:35:03 -0500 Subject: [PATCH 1/2] Add 'roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf' --- .../etc/apache2/sites-available/amcclure.ttm.sh.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf diff --git a/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf b/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf new file mode 100644 index 0000000..175d307 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf @@ -0,0 +1,11 @@ + + ServerAdmin amcclure@ttm.sh + ServerName amcclure.ttm.sh + DocumentRoot /var/www/amcclure + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + + From 6ee3c9fc1e223317dc846f0c6a1a3b3b2f882d33 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Thu, 3 Jan 2019 19:38:24 -0500 Subject: [PATCH 2/2] Update 'roles/webserver/tasks/apache.yml' --- roles/webserver/tasks/apache.yml | 46 +++++++++----------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml index e6215da..c5be8e8 100644 --- a/roles/webserver/tasks/apache.yml +++ b/roles/webserver/tasks/apache.yml @@ -10,16 +10,6 @@ src: ../files/etc/apache2/sites-available/default-ssl.conf dest: /etc/apache2/sites-available/default-ssl.conf -- name: Deploy ftp.summit.ttm.sh.conf - copy: - src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh.conf - dest: /etc/apache2/sites-available/ftp.summit.ttm.sh.conf - -#- name: Deploy ftp.summit.ttm.sh-le-ssl.conf -# copy: -# src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf -# dest: /etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf - - name: Deploy mail.thunix.cf.conf copy: src: ../files/etc/apache2/sites-available/mail.thunix.cf.conf @@ -35,21 +25,6 @@ src: ../files/etc/apache2/sites-available/ny.dyniform.net.conf dest: /etc/apache2/sites-available/ny.dyniform.net.conf -- name: Deploy summit-nosite.conf - copy: - src: ../files/etc/apache2/sites-available/summit-nosite.conf - dest: /etc/apache2/sites-available/summit-nosite.conf - -- name: Deploy summit.ttm.sh.conf - copy: - src: ../files/etc/apache2/sites-available/summit.ttm.sh.conf - dest: /etc/apache2/sites-available/summit.ttm.sh.conf - -#- name: Deploy summit.ttm.sh-le-ssl.conf -# copy: -# src: ../files/etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf -# dest: /etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf - - name: Deploy thunix.cf.conf copy: src: ../files/etc/apache2/sites-available/thunix.cf.conf @@ -65,15 +40,10 @@ src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf dest: /etc/apache2/sites-available/thunix.tilde.chat.conf -- name: Deploy www.summit.ttm.sh.conf - copy: - src: ../files/etc/apache2/sites-available/www.summit.ttm.sh.conf - dest: /etc/apache2/sites-available/www.summit.ttm.sh.conf - -#- name: Deploy www.summit.ttm.sh-le-ssl.conf +#- name: Deploy thunix.tilde.chat.conf # copy: -# src: ../files/etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf -# dest: /etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf +# src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf +# dest: /etc/apache2/sites-available/thunix.tilde.chat.conf - name: Deploy www.thunix.cf.conf copy: @@ -84,3 +54,13 @@ # 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 amcclure.ttm.sh.conf + copy: + src: ../files/etc/apache2/sites-available/amcclure.ttm.sh.conf + dest: /etc/apache2/sites-available/amcclure.ttm.sh.conf + +#- name: Deploy amcclure.ttm.sh-le-ssl.conf +# copy: +# src: ../files/etc/apache2/sites-available/amcclure.ttm.sh-le-ssl.conf +# dest: /etc/apache2/sites-available/amcclure.ttm.sh-le-ssl.conf \ No newline at end of file