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

additional fixes for sites-available

This commit is contained in:
Anton McClure 2019-05-25 10:22:39 -04:00 committed by fosslinux
parent 4e537455bd
commit 19f4c6be89
6 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/webserver/files/etc/apache2/sites-available/deb.thunix.net.conf
View File

@ -22,5 +22,8 @@
Order deny,allow Order deny,allow
Deny from all Deny from all
</Directorymatch> </Directorymatch>
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
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

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

@ -23,9 +23,8 @@ RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
Order deny,allow Order deny,allow
Deny from all Deny from all
</Directorymatch> </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 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
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

21
roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf
View File

@ -1,7 +1,7 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin webmaster@thunix.net ServerAdmin webmaster@thunix.net
ServerName www.thunix.net ServerName dev.thunix.net
ServerAlias www.thunixme5v4rnoby.onion ServerAlias dev.thunixme5v4rnoby.onion
DocumentRoot /var/www/thunix.cf 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
@ -10,3 +10,20 @@
Deny from all Deny from all
</Directorymatch> </Directorymatch>
</VirtualHost> </VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
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
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
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
</VirtualHost>
</IfModule>

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

@ -39,7 +39,7 @@
</Directory> </Directory>
Include /etc/letsencrypt/options-ssl-apache.conf Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.net/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.net/privkey.pem
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

4
roles/webserver/files/etc/apache2/sites-available/rpm.thunix.net.conf
View File

@ -23,7 +23,7 @@
Deny from all Deny from all
</Directorymatch> </Directorymatch>
Include /etc/letsencrypt/options-ssl-apache.conf Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.net/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.net/privkey.pem
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

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

@ -33,8 +33,8 @@ RewriteEngine on
RewriteRule ^ https://www.%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] RewriteRule ^ https://www.%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
Include /etc/letsencrypt/options-ssl-apache.conf Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/thunix.net/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/thunix.net/privkey.pem
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>