From fb6825f869e7895940a3df2f15da6cdac32a1e0b Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sat, 24 Feb 2018 10:38:28 +0100 Subject: wip --- .../apache2/sites-available/mw.trygvis.io-ssl.conf | 29 ++++++++++++++++++++++ ansible/roles/mw-frontend/tasks/main.yml | 5 ++-- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf (limited to 'ansible/roles/mw-frontend') diff --git a/ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf b/ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf new file mode 100644 index 0000000..6260e2e --- /dev/null +++ b/ansible/roles/mw-frontend/files/etc/apache2/sites-available/mw.trygvis.io-ssl.conf @@ -0,0 +1,29 @@ + + + ServerAdmin root@trygvis.io + ServerName mw.trygvis.io + + LogLevel warn + ErrorLog ${APACHE_LOG_DIR}/mw.trygvis.io-error.log + CustomLog ${APACHE_LOG_DIR}/mw.trygvis.io-access.log combined + + DocumentRoot /var/www/mw.trygvis.io/htdocs + + Options FollowSymLinks + AllowOverride None + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Order allow,deny + allow from all + + + ProxyPreserveHost On + ProxyPass / http://conflatorio.vpn.trygvis.io:8080/ + + SSLCertificateFile /etc/letsencrypt/live/mw.trygvis.io/fullchain.pem + SSLCertificateKeyFile /etc/letsencrypt/live/mw.trygvis.io/privkey.pem + Include /etc/letsencrypt/options-ssl-apache.conf + + diff --git a/ansible/roles/mw-frontend/tasks/main.yml b/ansible/roles/mw-frontend/tasks/main.yml index 9c667d1..b7bb13f 100644 --- a/ansible/roles/mw-frontend/tasks/main.yml +++ b/ansible/roles/mw-frontend/tasks/main.yml @@ -1,6 +1,5 @@ --- - name: apache config copy: - dest: /etc/apache/sites-enabled/mw.trygvis.io.conf - content: | - woop! + src: etc/apache2/sites-available/mw.trygvis.io-ssl.conf + dest: /etc/apache2/sites-available/mw.trygvis.io-ssl.conf -- cgit v1.2.3