Thunix
/
ansible
mirror of https://github.com/ThunixdotNet/ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Issue 118] Clean Up Site Configs (Sites-Available)

This commit is contained in:
Anton McClure 2019-05-24 16:17:58 -04:00
parent 01992b2c22
commit b17a7b2fd7
No known key found for this signature in database
GPG Key ID: DC9155FB2EEAA2EF
14 changed files with 115 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf
View File

@ -1,17 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

19
roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf
View File

@ -1,5 +1,5 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin amcclure@ttm.sh ServerAdmin webmaster@thunix.net
ServerName dev.thunix.cf ServerName dev.thunix.cf
DocumentRoot /var/www/dev.thunix.cf DocumentRoot /var/www/dev.thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
@ -12,3 +12,20 @@ RewriteEngine on
RewriteCond %{SERVER_NAME} =dev.thunix.cf RewriteCond %{SERVER_NAME} =dev.thunix.cf
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

25
roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net-le-ssl.conf
View File

@ -1,25 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
<Directory /var/www/ftp.thunix.cf>
IndexOptions FancyIndexing NameWidth=* FoldersFirst ScanHTMLTitles DescriptionWidth=*
HeaderName HEADER.html
ReadmeName README.html
AllowOverride FileInfo Indexes
Options Indexes SymLinksIfOwnerMatch FollowSymLinks
ErrorDocument 404 default
</Directory>
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
</VirtualHost>
</IfModule>

18
roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf
View File

@ -18,11 +18,10 @@
ErrorDocument 404 default ErrorDocument 404 default
</Directory> </Directory>
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<IfModule mod_ssl.c> <VirtualHost *:443>
<VirtualHost *:443>
ServerAdmin webmaster@thunix.net ServerAdmin webmaster@thunix.net
ServerName ftp.thunix.cf ServerName ftp.thunix.net
DocumentRoot /var/www/ftp.thunix.cf DocumentRoot /var/www/ftp.thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access.log combined
@ -38,8 +37,9 @@
Options Indexes SymLinksIfOwnerMatch FollowSymLinks Options Indexes SymLinksIfOwnerMatch FollowSymLinks
ErrorDocument 404 default ErrorDocument 404 default
</Directory> </Directory>
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
</VirtualHost> SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
</IfModule> </VirtualHost>
</IfModule>

17
roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf
View File

@ -1,17 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

19
roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf
View File

@ -1,5 +1,5 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin amcclure@ttm.sh ServerAdmin webmaster@thunix.net
ServerName phoenix.thunix.cf ServerName phoenix.thunix.cf
DocumentRoot /var/www/thunix.cf DocumentRoot /var/www/thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
@ -12,3 +12,20 @@ RewriteEngine on
RewriteCond %{SERVER_NAME} =phoenix.thunix.cf RewriteCond %{SERVER_NAME} =phoenix.thunix.cf
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

17
roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
View File

@ -1,17 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

17
roles/webserver/files/etc/apache2/sites-available/thunix.cf.conf
View File

@ -9,3 +9,20 @@
Deny from all Deny from all
</Directorymatch> </Directorymatch>
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/thunix.cf/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/thunix.cf/privkey.pem
</VirtualHost>
</IfModule>

17
roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat-le-ssl.conf
View File

@ -1,17 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

17
roles/webserver/files/etc/apache2/sites-available/thunix.tilde.chat.conf
View File

@ -12,3 +12,20 @@ RewriteEngine on
RewriteCond %{SERVER_NAME} =thunix.tilde.chat RewriteCond %{SERVER_NAME} =thunix.tilde.chat
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

17
roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
View File

@ -1,17 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

17
roles/webserver/files/etc/apache2/sites-available/www.thunix.cf.conf
View File

@ -9,3 +9,20 @@
Deny from all Deny from all
</Directorymatch> </Directorymatch>
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

23
roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf
View File

@ -1,23 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
<Location /shell>
ProxyPass http://127.0.0.1:4200/
Order allow,deny
Allow from all
</Location>
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
</VirtualHost>
</IfModule>

20
roles/webserver/files/etc/apache2/sites-available/www.thunix.net.conf
View File

@ -1,8 +1,7 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin webmaster@thunix.net ServerAdmin webmaster@thunix.net
ServerName www.thunix.net ServerName www.thunix.net
ServerAlias www.thunixme5v4rnoby.onion DocumentRoot /var/www/thunix.net
DocumentRoot /var/www/thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access.log combined
<Directorymatch "^/.*/\.git/"> <Directorymatch "^/.*/\.git/">
@ -10,3 +9,20 @@
Deny from all Deny from all
</Directorymatch> </Directorymatch>
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>