diff --git a/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf b/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf index 9254ca4..7e8dab2 100644 --- a/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf +++ b/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf @@ -1,12 +1,27 @@ - - 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 - - Order deny,allow - Deny from all - - \ No newline at end of file + + ServerAdmin amcclure@ttm.sh + ServerName amcclure.tilde + DocumentRoot /var/www/tilde + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + + + + + + ServerAdmin amcclure@ttm.sh + ServerName amcclure.tilde + DocumentRoot /var/www/tilde + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + +SSLCertificateFile /home/amcclure/amcclure.tilde.cert +SSLCertificateKeyFile /home/amcclure/amcclure.tilde.key + + diff --git a/roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf b/roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf new file mode 100644 index 0000000..b85f28b --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf @@ -0,0 +1,27 @@ + + 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 + + Order deny,allow + Deny from all + + + + + + 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 + + Order deny,allow + Deny from all + +SSLCertificateFile /home/amcclure/www.amcclure.tilde.cert +SSLCertificateKeyFile /home/amcclure/www.amcclure.tilde.key + + \ No newline at end of file diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml index cd2e4e5..d25ffec 100644 --- a/roles/webserver/tasks/apache.yml +++ b/roles/webserver/tasks/apache.yml @@ -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 \ No newline at end of file + 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 \ No newline at end of file