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 07370b4..7f4820a 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 @@ -8,5 +8,19 @@ Order deny,allow Deny from all - + + + + ServerAdmin webmaster@thunix.net + ServerName deb.thunix.net + ServerAlias deb.thunixme5v4rnoby.onion + DocumentRoot /var/www/deb.thunix.net + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + + + 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 1bdcf65..5190d6b 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 @@ -8,5 +8,22 @@ Order deny,allow Deny from all - + + + + ServerAdmin webmaster@thunix.net + ServerName rpm.thunix.net + ServerAlias rpm.thunixme5v4rnoby.onion + DocumentRoot /var/www/rpm.thunix.net + 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/staticadventures.netlib.re.conf b/roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf index f3580e0..fbc557e 100644 --- a/roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf +++ b/roles/webserver/files/etc/apache2/sites-available/staticadventures.netlib.re.conf @@ -7,11 +7,11 @@ Order deny,allow Deny from all - + - + ServerAdmin staticadventures@riseup.net ServerName staticadventures.netlib.re DocumentRoot /var/www/staticadventures.netlib.re @@ -20,7 +20,7 @@ Order deny,allow Deny from all - + SSLCertificateFile /etc/letsencrypt/live/staticadventures.netlib.re/fullchain.pem SSLCertificateKeyFile /etc/letsencrypt/live/staticadventures.netlib.re/privkey.pem Include /etc/letsencrypt/options-ssl-apache.conf 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 deleted file mode 100644 index 977756e..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerAdmin webmaster@thunix.net - ServerName thunix.net - ServerAlias 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 - -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} =thunix.net - 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 - - - ProxyPass http://localhost:4200/ - Order allow,deny - Allow from all - - - - 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 b4302c5..0313039 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net.conf @@ -13,3 +13,28 @@ RewriteEngine on RewriteCond %{SERVER_NAME} =thunix.net RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + + + ServerAdmin webmaster@thunix.net + ServerName thunix.net + ServerAlias 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 + +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} =thunix.net + 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 + + +