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 deleted file mode 100644 index 4ba3cab..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - 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 - - -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 - - 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 f2780a5..73f01b6 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 amcclure@ttm.sh + ServerAdmin webmaster@thunix.net ServerName dev.thunix.cf DocumentRoot /var/www/dev.thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log @@ -12,3 +12,20 @@ RewriteEngine on RewriteCond %{SERVER_NAME} =dev.thunix.cf RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + + + ServerAdmin webmaster@thunix.net + 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 + + +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 + + 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 deleted file mode 100644 index ca743b5..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net-le-ssl.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - 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 - - - IndexOptions FancyIndexing NameWidth=* FoldersFirst ScanHTMLTitles DescriptionWidth=* - HeaderName HEADER.html - ReadmeName README.html - AllowOverride FileInfo Indexes - Options Indexes SymLinksIfOwnerMatch FollowSymLinks - ErrorDocument 404 default - - -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/ftp.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf index f4d864f..38adc44 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 @@ -18,18 +18,17 @@ ErrorDocument 404 default - - - + + ServerAdmin webmaster@thunix.net - ServerName ftp.thunix.cf + 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 - + IndexOptions FancyIndexing NameWidth=* FoldersFirst ScanHTMLTitles DescriptionWidth=* HeaderName HEADER.html @@ -38,8 +37,9 @@ Options Indexes SymLinksIfOwnerMatch FollowSymLinks ErrorDocument 404 default - SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem - SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem - Include /etc/letsencrypt/options-ssl-apache.conf - - + +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 deleted file mode 100644 index 10522ea..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - ServerAdmin amcclure@ttm.sh - ServerName phoenix.thunix.cf - 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/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 4cd8737..fe60a81 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 amcclure@ttm.sh + ServerAdmin webmaster@thunix.net ServerName phoenix.thunix.cf DocumentRoot /var/www/thunix.cf ErrorLog ${APACHE_LOG_DIR}/error.log @@ -12,3 +12,20 @@ RewriteEngine on RewriteCond %{SERVER_NAME} =phoenix.thunix.cf RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + + + ServerAdmin webmaster@thunix.net + ServerName phoenix.thunix.cf + 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/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.cf-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf deleted file mode 100644 index ebc5be7..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - ServerAdmin amcclure@ttm.sh - ServerName thunix.cf - 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/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.cf.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf index ee38aea..8a16dd7 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf @@ -9,3 +9,20 @@ Deny from all + + + ServerAdmin webmaster@thunix.net + ServerName thunix.cf + 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/thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/thunix.cf/privkey.pem + + diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf deleted file mode 100644 index 326111d..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - ServerAdmin webmaster@thunix.net - ServerName thunix.tilde.chat - DocumentRoot /var/www/thunix.cf - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - Order deny,allow - Deny from all - - -SSLCertificateFile /etc/letsencrypt/live/thunix.tilde.chat/fullchain.pem -SSLCertificateKeyFile /etc/letsencrypt/live/thunix.tilde.chat/privkey.pem -Include /etc/letsencrypt/options-ssl-apache.conf - - diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf index a6741e0..a591481 100644 --- a/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf @@ -12,3 +12,20 @@ RewriteEngine on RewriteCond %{SERVER_NAME} =thunix.tilde.chat RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + + + ServerAdmin webmaster@thunix.net + ServerName thunix.tilde.chat + DocumentRoot /var/www/thunix.cf + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + Order deny,allow + Deny from all + + +SSLCertificateFile /etc/letsencrypt/live/thunix.tilde.chat/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/thunix.tilde.chat/privkey.pem +Include /etc/letsencrypt/options-ssl-apache.conf + + 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 deleted file mode 100644 index bb23250..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf +++ /dev/null @@ -1,17 +0,0 @@ - - - ServerAdmin amcclure@ttm.sh - ServerName www.thunix.cf - 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/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.conf b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf index 3f66609..ca416d9 100644 --- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf +++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf @@ -9,3 +9,20 @@ Deny from all + + + ServerAdmin webmaster@thunix.net + ServerName www.thunix.cf + 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/www.thunix.cf/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/www.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 deleted file mode 100644 index e7cb76a..0000000 --- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf +++ /dev/null @@ -1,23 +0,0 @@ - - - ServerAdmin webmaster@thunix.net - ServerName www.thunix.net - DocumentRoot /var/www/thunix.cf - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - Order deny,allow - Deny from all - - - - ProxyPass http://127.0.0.1:4200/ - Order allow,deny - Allow 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/www.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf index 1c21a47..05e2365 100644 --- a/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf +++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf @@ -1,8 +1,7 @@ ServerAdmin webmaster@thunix.net ServerName www.thunix.net - ServerAlias www.thunixme5v4rnoby.onion - DocumentRoot /var/www/thunix.cf + DocumentRoot /var/www/thunix.net ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined @@ -10,3 +9,20 @@ Deny from all + + + ServerAdmin webmaster@thunix.net + ServerName www.thunix.net + DocumentRoot /var/www/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/www.thunix.net/fullchain.pem +SSLCertificateKeyFile /etc/letsencrypt/live/www.thunix.net/privkey.pem + +