Thunix
/
ansible
mirror of https://github.com/ThunixdotNet/ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Anton McClure 2019-01-06 22:39:34 -05:00 committed by Gitea
parent 3f9960deb4 401445436d
commit ecb02927b2
3 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf
View File

@ -1,7 +1,6 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin amcclure@ttm.sh ServerAdmin amcclure@ttm.sh
ServerName amcclure.tilde ServerName amcclure.tilde
ServerAlias www.amcclure.tilde
DocumentRoot /var/www/tilde DocumentRoot /var/www/tilde
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access.log combined
@ -9,4 +8,20 @@
Order deny,allow Order deny,allow
Deny from all Deny from all
</Directorymatch> </Directorymatch>
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerAdmin amcclure@ttm.sh
ServerName amcclure.tilde
DocumentRoot /var/www/tilde
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
SSLCertificateFile /home/amcclure/amcclure.tilde.cert
SSLCertificateKeyFile /home/amcclure/amcclure.tilde.key
</VirtualHost>
</IfModule>

27
roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf Normal file
View File

@ -0,0 +1,27 @@
<VirtualHost *:80>
ServerAdmin amcclure@ttm.sh
ServerName www.amcclure.tilde
DocumentRoot /var/www/tilde
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 www.amcclure.tilde
DocumentRoot /var/www/tilde
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
SSLCertificateFile /home/amcclure/www.amcclure.tilde.cert
SSLCertificateKeyFile /home/amcclure/www.amcclure.tilde.key
</VirtualHost>
</IfModule>

5
roles/webserver/tasks/apache.yml
View File

@ -69,3 +69,8 @@
copy: copy:
src: ../files/etc/apache2/sites-available/amcclure.tilde.conf src: ../files/etc/apache2/sites-available/amcclure.tilde.conf
dest: /etc/apache2/sites-available/amcclure.tilde.conf dest: /etc/apache2/sites-available/amcclure.tilde.conf
- name: Deploy www.amcclure.tilde.conf
copy:
src: ../files/etc/apache2/sites-available/www.amcclure.tilde.conf
dest: /etc/apache2/sites-available/www.amcclure.tilde.conf