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
commit ecb02927b2
3 changed files with 60 additions and 13 deletions

View File

@ -1,12 +1,27 @@
<VirtualHost *:80>
ServerAdmin amcclure@ttm.sh
ServerName amcclure.tilde
ServerAlias 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>
<VirtualHost *:80>
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>
</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>

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>

View File

@ -68,4 +68,9 @@
- name: Deploy amcclure.tilde.conf
copy:
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