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

Adding post-certbot files

This commit is contained in:
Ubergeek 2019-02-16 02:29:20 +00:00
parent 9b4f37939e
commit 032ba2edcb
9 changed files with 56 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<VirtualHost *:443> <VirtualHost *:443>
ServerAdmin webmaster@thunix.net ServerAdmin amcclure@ttm.sh
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
@ -11,7 +11,27 @@
</Directorymatch> </Directorymatch>
Include /etc/letsencrypt/options-ssl-apache.conf Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/phoenix.thunix.cf/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/phoenix.thunix.cf/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
</VirtualHost>
</IfModule>
<IfModule mod_ssl.c>
<VirtualHost *:80>
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>
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} =dev.thunix.cf
# RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

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

@ -1,5 +1,5 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin webmaster@thunix.net ServerAdmin amcclure@ttm.sh
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

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

@ -0,0 +1,18 @@
<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>
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>

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

@ -1,6 +1,6 @@
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<VirtualHost *:443> <VirtualHost *:443>
ServerAdmin webmaster@thunix.net ServerAdmin amcclure@ttm.sh
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
@ -11,7 +11,7 @@
</Directorymatch> </Directorymatch>
Include /etc/letsencrypt/options-ssl-apache.conf Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/phoenix.thunix.cf/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/phoenix.thunix.cf/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

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

@ -1,5 +1,5 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin webmaster@thunix.net ServerAdmin amcclure@ttm.sh
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

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

@ -1,6 +1,6 @@
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<VirtualHost *:443> <VirtualHost *:443>
ServerAdmin webmaster@thunix.net ServerAdmin amcclure@ttm.sh
ServerName thunix.cf ServerName thunix.cf
DocumentRoot /var/www/thunix.cf DocumentRoot /var/www/thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
@ -11,7 +11,7 @@
</Directorymatch> </Directorymatch>
Include /etc/letsencrypt/options-ssl-apache.conf Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/phoenix.thunix.cf/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/phoenix.thunix.cf/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

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

@ -17,7 +17,7 @@ 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/thunix.net-0001/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/thunix.net-0001/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

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

@ -1,6 +1,6 @@
<IfModule mod_ssl.c> <IfModule mod_ssl.c>
<VirtualHost *:443> <VirtualHost *:443>
ServerAdmin webmaster@thunix.net ServerAdmin amcclure@ttm.sh
ServerName www.thunix.cf ServerName www.thunix.cf
DocumentRoot /var/www/thunix.cf DocumentRoot /var/www/thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
@ -11,7 +11,7 @@
</Directorymatch> </Directorymatch>
Include /etc/letsencrypt/options-ssl-apache.conf Include /etc/letsencrypt/options-ssl-apache.conf
SSLCertificateFile /etc/letsencrypt/live/phoenix.thunix.cf/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/ftp.thunix.cf/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/phoenix.thunix.cf/privkey.pem SSLCertificateKeyFile /etc/letsencrypt/live/ftp.thunix.cf/privkey.pem
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>

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

@ -10,8 +10,8 @@
Deny from all Deny from all
</Directorymatch> </Directorymatch>
SSLCertificateFile /etc/letsencrypt/live/www.thunix.net/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/www.thunix.net/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
</VirtualHost> </VirtualHost>
</IfModule> </IfModule>