From af5091c37d63f4771bb979b46abe1aa9cfcdbaa7 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Sun, 6 Jan 2019 22:34:26 -0500 Subject: [PATCH 1/4] Update 'roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf' --- .../sites-available/amcclure.tilde.conf | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) 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..8334d31 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,29 @@ - - 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 + 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 + + + + + + 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 + +SSLCertificateFile /home/amcclure/amcclure.tilde.cert +SSLCertificateKeyFile /home/amcclure/amcclure.tilde.key + + From 114878ddafabf4ba7d9aafc42276be2850d210f1 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Sun, 6 Jan 2019 22:35:22 -0500 Subject: [PATCH 2/4] Add 'roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf' --- .../sites-available/www.amcclure.tilde.conf | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf 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 From e5d0e152d9c11add37b1d1176b3f17fbdc763c96 Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Sun, 6 Jan 2019 22:36:23 -0500 Subject: [PATCH 3/4] Update 'roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf' --- .../files/etc/apache2/sites-available/amcclure.tilde.conf | 2 -- 1 file changed, 2 deletions(-) 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 8334d31..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,7 +1,6 @@ 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 @@ -15,7 +14,6 @@ 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 From 401445436dba873abc0451dec8ccc2376fcc49cb Mon Sep 17 00:00:00 2001 From: Anton McClure Date: Sun, 6 Jan 2019 22:37:56 -0500 Subject: [PATCH 4/4] Update 'roles/webserver/tasks/apache.yml' --- roles/webserver/tasks/apache.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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