diff --git a/roles/webserver/files/etc/apache2/sites-available/deb.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/deb.thunix.net.conf index 7f4820a..ee22c22 100644 --- a/roles/webserver/files/etc/apache2/sites-available/deb.thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/deb.thunix.net.conf @@ -22,5 +22,8 @@ Order deny,allow Deny from all +Include /etc/letsencrypt/options-ssl-apache.conf +SSLCertificateFile /etc/letsencrypt/live/deb.thunix.net/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/deb.thunix.net/privkey.pem 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 73f01b6..e82de0e 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 @@ -23,9 +23,8 @@ RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] Order deny,allow Deny from all - -SSLCertificateFile /etc/letsencrypt/live/dev.thunix.cf-0001/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/dev.thunix.cf-0001/privkey.pem Include /etc/letsencrypt/options-ssl-apache.conf +SSLCertificateFile /etc/letsencrypt/live/dev.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/dev.thunix.cf/privkey.pem diff --git a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf index d83ca7d..5fad7f3 100644 --- a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf @@ -1,7 +1,7 @@ ServerAdmin webmaster@thunix.net - ServerName www.thunix.net - ServerAlias www.thunixme5v4rnoby.onion + ServerName dev.thunix.net + ServerAlias dev.thunixme5v4rnoby.onion DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined @@ -10,3 +10,20 @@ Deny from all + + + ServerAdmin webmaster@thunix.net + ServerName dev.thunix.net + ServerAlias dev.thunixme5v4rnoby.onion + DocumentRoot /var/www/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/dev.thunix.net/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/dev.thunix.net/privkey.pem + + diff --git a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf index 38adc44..046cfb9 100644 --- a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf @@ -39,7 +39,7 @@ 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 +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.net/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.net/privkey.pem diff --git a/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf index 5190d6b..cee0d6c 100644 --- a/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf @@ -23,7 +23,7 @@ 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 +SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.net/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.net/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 0313039..f577b81 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf @@ -33,8 +33,8 @@ RewriteEngine on RewriteRule ^ https://www.%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] 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 +SSLCertificateFile /etc/letsencrypt/live/thunix.net/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/thunix.net/privkey.pem