diff --git a/roles/webserver/files/etc/apache2/sites-available/amcclure.cf.conf b/roles/webserver/files/etc/apache2/sites-available/amcclure.cf.conf deleted file mode 100644 index 7451628..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/amcclure.cf.conf +++ /dev/null @@ -1,28 +0,0 @@ - - ServerAdmin amcclure@ttm.sh - ServerName amcclure.cf - DocumentRoot /var/www/amcclure - 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.cf - DocumentRoot /var/www/amcclure - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - Order deny,allow - Deny from all - - SSLCertificateFile /etc/letsencrypt/live/amcclure.cf/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/amcclure.cf/privkey.pem - Include /etc/letsencrypt/options-ssl-apache.conf - - \ No newline at end of file diff --git a/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf b/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf deleted file mode 100644 index 2750216..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/amcclure.tilde.conf +++ /dev/null @@ -1,27 +0,0 @@ - - ServerAdmin amcclure@ttm.sh - ServerName amcclure.tilde - DocumentRoot /var/www/www.amcclure.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/www.amcclure.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.crt -SSLCertificateKeyFile /home/amcclure/amcclure.tilde.key - - diff --git a/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf b/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf deleted file mode 100644 index 4fe73ce..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf +++ /dev/null @@ -1,28 +0,0 @@ - - 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 - - Order deny,allow - Deny from all - - - -# -# -# 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 -# -# Order deny,allow -# Deny from all -# -# SSLCertificateFile /etc/letsencrypt/live/amcclure.ttm.sh/fullchain.pem -# SSLCertificateKeyFile /etc/letsencrypt/live/amcclure.tt.sh/privkey.pem -# Include /etc/letsencrypt/options-ssl-apache.conf -# -# \ No newline at end of file diff --git a/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf index 7145438..f5d8a5c 100644 --- a/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf +++ b/roles/webserver/files/etc/apache2/sites-available/default-ssl.conf @@ -1,6 +1,6 @@ - ServerAdmin amcclure@ttm.sh + ServerAdmin webmaster@thunix.net DocumentRoot /var/www/thunix.cf diff --git a/roles/webserver/files/etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf deleted file mode 100644 index c44c331..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/mail.thunix.cf-le-ssl.conf +++ /dev/null @@ -1,14 +0,0 @@ - - - ServerAdmin amcclure@ttm.sh - ServerName mail.thunix.cf - DocumentRoot /var/www/thunix/mail - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined -SSLCertificateFile /etc/letsencrypt/live/mail.thunix.cf/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/mail.thunix.cf/privkey.pem -Include /etc/letsencrypt/options-ssl-apache.conf - - - - diff --git a/roles/webserver/files/etc/apache2/sites-available/mail.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/mail.thunix.cf.conf deleted file mode 100644 index f05429a..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/mail.thunix.cf.conf +++ /dev/null @@ -1,7 +0,0 @@ - - ServerAdmin amcclure@ttm.sh - ServerName mail.thunix.cf - DocumentRoot /var/www/thunix/mail - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - diff --git a/roles/webserver/files/etc/apache2/sites-available/ny.dyniform.net.conf b/roles/webserver/files/etc/apache2/sites-available/ny.dyniform.net.conf deleted file mode 100644 index ab91b4b..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/ny.dyniform.net.conf +++ /dev/null @@ -1,7 +0,0 @@ - - ServerAdmin amcclure@ttm.sh - ServerName ny.dyniform.net - DocumentRoot /var/www/dyniform - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf index f01d717..7da4955 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf @@ -5,8 +5,13 @@ DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined -SSLCertificateFile /etc/letsencrypt/live/thunix.cf/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/thunix.cf/privkey.pem + + Order deny,allow + Deny from all + + Include /etc/letsencrypt/options-ssl-apache.conf +SSLCertificateFile /etc/letsencrypt/live/phoenix.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/phoenix.thunix.cf/privkey.pem diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf index 95619fd..7d07c00 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf @@ -8,4 +8,7 @@ Order deny,allow Deny from all +RewriteEngine on +RewriteCond %{SERVER_NAME} =thunix.net +RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] diff --git a/roles/webserver/files/etc/apache2/sites-available/www.amcclure.cf.conf b/roles/webserver/files/etc/apache2/sites-available/www.amcclure.cf.conf deleted file mode 100644 index 9127d49..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/www.amcclure.cf.conf +++ /dev/null @@ -1,28 +0,0 @@ - - ServerAdmin amcclure@ttm.sh - ServerName www.amcclure.cf - DocumentRoot /var/www/amcclure - 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.cf - DocumentRoot /var/www/amcclure - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - Order deny,allow - Deny from all - - SSLCertificateFile /etc/letsencrypt/live/www.amcclure.cf/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/www.amcclure.cf/privkey.pem - Include /etc/letsencrypt/options-ssl-apache.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 deleted file mode 100644 index 4c4a717..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/www.amcclure.tilde.conf +++ /dev/null @@ -1,27 +0,0 @@ - - ServerAdmin amcclure@ttm.sh - ServerName www.amcclure.tilde - DocumentRoot /var/www/www.amcclure.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/www.amcclure.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.crt -SSLCertificateKeyFile /home/amcclure/www.amcclure.tilde.key - - \ No newline at end of file diff --git a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf index 7d31095..72a2ed2 100644 --- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf +++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf @@ -5,8 +5,13 @@ DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined -SSLCertificateFile /etc/letsencrypt/live/www.thunix.cf/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/www.thunix.cf/privkey.pem + + Order deny,allow + Deny from all + + Include /etc/letsencrypt/options-ssl-apache.conf +SSLCertificateFile /etc/letsencrypt/live/phoenix.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/phoenix.thunix.cf/privkey.pem diff --git a/roles/webserver/files/etc/apache2/sites-available/you.wer.ee.conf b/roles/webserver/files/etc/apache2/sites-available/you.wer.ee.conf deleted file mode 100644 index bfe69d6..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/you.wer.ee.conf +++ /dev/null @@ -1,11 +0,0 @@ - - ServerAdmin amcclure@ttm.sh - ServerName you.wer.ee - DocumentRoot /var/www/you.wer.ee - 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