jmjl
/
ansible-thunix
forked from thunix/ansible
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating confs

This commit is contained in:
Ubergeek 2019-02-16 01:42:17 +00:00
parent 50c0b5cecd
commit 9138fcc9fc
9 changed files with 146 additions and 0 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 Normal file
View File

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

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

@ -0,0 +1,14 @@
<VirtualHost *:80>
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>
RewriteEngine on
RewriteCond %{SERVER_NAME} =dev.thunix.cf
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
</VirtualHost>

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

@ -0,0 +1,11 @@
<VirtualHost *:80>
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>
</VirtualHost>

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

@ -0,0 +1,28 @@
<VirtualHost *:80>
ServerAdmin webmaster@thunix.net
ServerName ftp.thunix.cf
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>
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerAdmin webmaster@thunix.net
ServerName ftp.thunix.cf
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>
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
</VirtualHost>
</IfModule>

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

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

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

@ -0,0 +1,14 @@
<VirtualHost *:80>
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>
RewriteEngine on
RewriteCond %{SERVER_NAME} =phoenix.thunix.cf
RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
</VirtualHost>

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

@ -0,0 +1,23 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerAdmin webmaster@thunix.net
ServerName 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>
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/thunix.net-0001/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/thunix.net-0001/privkey.pem
</VirtualHost>
</IfModule>

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

@ -0,0 +1,17 @@
<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>
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
</VirtualHost>
</IfModule>

5
roles/webserver/tasks/apache.yml
View File

@ -42,3 +42,8 @@
copy:
src: ../files/etc/apache2/sites-available/www.thunix.net.conf
dest: /etc/apache2/sites-available/www.thunix.net.conf
- name: Deploy apache2 site conf for ftp.thunix.net.conf
copy:
src: ../files/etc/apache2/sites-available/ftp.thunix.net.conf
dest: /etc/apache2/sites-available/ftp.thunix.net.conf