From 032ba2edcbbcb070f20b590d80feb475ecbd93ac Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sat, 16 Feb 2019 02:29:20 +0000 Subject: [PATCH] Adding post-certbot files --- .../sites-available/dev.thunix.cf-le-ssl.conf | 26 ++++++++++++++++--- .../sites-available/dev.thunix.cf.conf | 2 +- .../ftp.thunix.net-le-ssl.conf | 18 +++++++++++++ .../phoenix.thunix.cf-le-ssl.conf | 6 ++--- .../sites-available/phoenix.thunix.cf.conf | 2 +- .../sites-available/thunix.cf-le-ssl.conf | 6 ++--- .../sites-available/thunix.net-le-ssl.conf | 4 +-- .../sites-available/www.thunix.cf-le-ssl.conf | 6 ++--- .../www.thunix.net-le-ssl.conf | 4 +-- 9 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net-le-ssl.conf diff --git a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf index f62a0a2..230b893 100644 --- a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf +++ b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf @@ -1,6 +1,6 @@ - ServerAdmin webmaster@thunix.net + ServerAdmin amcclure@ttm.sh ServerName dev.thunix.cf DocumentRoot /var/www/dev.thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log @@ -11,7 +11,27 @@ 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 +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem + + + + + ServerAdmin amcclure@ttm.sh + ServerName dev.thunix.cf + DocumentRoot /var/www/dev.thunix.cf + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + +RewriteEngine on +# Some rewrite rules in this file were disabled on your HTTPS site, +# because they have the potential to create redirection loops. + +# RewriteCond %{SERVER_NAME} =dev.thunix.cf +# RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + diff --git a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf index df8dcb8..f2780a5 100644 --- a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf +++ b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf @@ -1,5 +1,5 @@ - ServerAdmin webmaster@thunix.net + ServerAdmin amcclure@ttm.sh ServerName dev.thunix.cf DocumentRoot /var/www/dev.thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log diff --git a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net-le-ssl.conf new file mode 100644 index 0000000..9218415 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net-le-ssl.conf @@ -0,0 +1,18 @@ + + + ServerAdmin webmaster@thunix.net + ServerName ftp.thunix.net + DocumentRoot /var/www/ftp.thunix.cf + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + + + +Include /etc/letsencrypt/options-ssl-apache.conf +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem + + diff --git a/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf index 60e0635..10522ea 100644 --- a/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf +++ b/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf @@ -1,6 +1,6 @@ - ServerAdmin webmaster@thunix.net + ServerAdmin amcclure@ttm.sh ServerName phoenix.thunix.cf DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log @@ -11,7 +11,7 @@ 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 +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem diff --git a/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf index 7024ae9..4cd8737 100644 --- a/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf +++ b/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf @@ -1,5 +1,5 @@ - ServerAdmin webmaster@thunix.net + ServerAdmin amcclure@ttm.sh ServerName phoenix.thunix.cf DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log 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 0bd995b..ebc5be7 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 @@ -1,6 +1,6 @@ - ServerAdmin webmaster@thunix.net + ServerAdmin amcclure@ttm.sh ServerName thunix.cf DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log @@ -11,7 +11,7 @@ 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 +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf index df4da28..d40ad68 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf @@ -17,7 +17,7 @@ RewriteEngine on RewriteRule ^ https://www.%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] Include /etc/letsencrypt/options-ssl-apache.conf -SSLCertificateFile /etc/letsencrypt/live/thunix.net-0001/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/thunix.net-0001/privkey.pem +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem 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 bf6eaf6..bb23250 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 @@ -1,6 +1,6 @@ - ServerAdmin webmaster@thunix.net + ServerAdmin amcclure@ttm.sh ServerName www.thunix.cf DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log @@ -11,7 +11,7 @@ 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 +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem diff --git a/roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf index d8ef640..b970d66 100644 --- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf +++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf @@ -10,8 +10,8 @@ Deny from all -SSLCertificateFile /etc/letsencrypt/live/www.thunix.net/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/www.thunix.net/privkey.pem Include /etc/letsencrypt/options-ssl-apache.conf +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem