Merge branch 'new-site-amcclure-ttm-sh' of thunix/ansible into master

This commit is contained in:
Anton McClure 2019-01-03 19:39:06 -05:00 committed by Gitea
commit bc9533a930
2 changed files with 24 additions and 33 deletions

View File

@ -0,0 +1,11 @@
<VirtualHost *:80>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
</VirtualHost>

View File

@ -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