From 9138fcc9fc781f223c0b296490444ce255c90035 Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sat, 16 Feb 2019 01:42:17 +0000 Subject: [PATCH] Updating confs --- .../sites-available/dev.thunix.cf-le-ssl.conf | 17 +++++++++++ .../sites-available/dev.thunix.cf.conf | 14 ++++++++++ .../sites-available/dev.thunix.net.conf | 11 ++++++++ .../sites-available/ftp.thunix.net.conf | 28 +++++++++++++++++++ .../phoenix.thunix.cf-le-ssl.conf | 17 +++++++++++ .../sites-available/phoenix.thunix.cf.conf | 14 ++++++++++ .../sites-available/thunix.net-le-ssl.conf | 23 +++++++++++++++ .../www.thunix.net-le-ssl.conf | 17 +++++++++++ roles/webserver/tasks/apache.yml | 5 ++++ 9 files changed, 146 insertions(+) create mode 100644 roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf create mode 100644 roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf create mode 100644 roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf create mode 100644 roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf create mode 100644 roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf create mode 100644 roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf create mode 100644 roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf create mode 100644 roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf 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 new file mode 100644 index 0000000..f62a0a2 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf-le-ssl.conf @@ -0,0 +1,17 @@ + + + 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 + + +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/dev.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf new file mode 100644 index 0000000..df8dcb8 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.cf.conf @@ -0,0 +1,14 @@ + + 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 + +RewriteEngine on +RewriteCond %{SERVER_NAME} =dev.thunix.cf +RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + diff --git a/roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf new file mode 100644 index 0000000..e0a3db3 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/dev.thunix.net.conf @@ -0,0 +1,11 @@ + + 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 + + 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 new file mode 100644 index 0000000..0ae1a48 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/ftp.thunix.net.conf @@ -0,0 +1,28 @@ + + 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 + + Order deny,allow + Deny from all + + + + + + 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 + + Order deny,allow + Deny from all + + 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 + + \ No newline at end of file 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 new file mode 100644 index 0000000..60e0635 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf-le-ssl.conf @@ -0,0 +1,17 @@ + + + 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/phoenix.thunix.cf.conf b/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf new file mode 100644 index 0000000..7024ae9 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/phoenix.thunix.cf.conf @@ -0,0 +1,14 @@ + + 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 + +RewriteEngine on +RewriteCond %{SERVER_NAME} =phoenix.thunix.cf +RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent] + diff --git a/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf b/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf new file mode 100644 index 0000000..df4da28 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/thunix.net-le-ssl.conf @@ -0,0 +1,23 @@ + + + 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 + + Order deny,allow + Deny from all + +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 + + 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 new file mode 100644 index 0000000..d8ef640 --- /dev/null +++ b/roles/webserver/files/etc/apache2/sites-available/www.thunix.net-le-ssl.conf @@ -0,0 +1,17 @@ + + + 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 + + +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 + + diff --git a/roles/webserver/tasks/apache.yml b/roles/webserver/tasks/apache.yml index c273c65..99c1bbc 100644 --- a/roles/webserver/tasks/apache.yml +++ b/roles/webserver/tasks/apache.yml @@ -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