From 443efffc41984ac604ffa733dd936fecd83006dd Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sat, 24 Feb 2018 15:42:59 +0100
Subject: wip

---
 .../apache2/sites-available/mw.trygvis.io-ssl.conf | 43 +++++++++++-----------
 ansible/roles/mw-frontend/tasks/main.yml           | 11 ++++--
 2 files changed, 29 insertions(+), 25 deletions(-)

(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
index 6260e2e..533c559 100644
--- 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
@@ -1,29 +1,30 @@
+# Ansible
 <IfModule mod_ssl.c>
 <VirtualHost *:443>
-        ServerAdmin root@trygvis.io
-        ServerName mw.trygvis.io
+  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
+  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
-        <Directory />
-                Options FollowSymLinks
-                AllowOverride None
-        </Directory>
-        <Directory /var/www/mw.trygvis.io/htdocs/>
-                Options Indexes FollowSymLinks MultiViews
-                AllowOverride None
-                Order allow,deny
-                allow from all
-        </Directory>
+  DocumentRoot /var/www/mw.trygvis.io/htdocs
+  <Directory />
+    Options FollowSymLinks
+    AllowOverride None
+  </Directory>
+  <Directory /var/www/mw.trygvis.io/htdocs/>
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride None
+    Order allow,deny
+    allow from all
+  </Directory>
 
-        ProxyPreserveHost On
-        ProxyPass / http://conflatorio.vpn.trygvis.io:8080/
+  ProxyPreserveHost On
+  ProxyPass / http://mw.trygvis.io/
 
-        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
+  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
 </VirtualHost>
 </IfModule>
diff --git a/ansible/roles/mw-frontend/tasks/main.yml b/ansible/roles/mw-frontend/tasks/main.yml
index b7bb13f..40906ea 100644
--- a/ansible/roles/mw-frontend/tasks/main.yml
+++ b/ansible/roles/mw-frontend/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
-- name: apache config
-  copy:
-    src: etc/apache2/sites-available/mw.trygvis.io-ssl.conf
-    dest: /etc/apache2/sites-available/mw.trygvis.io-ssl.conf
+- name: Apache config
+  become: yes
+  block:
+    - name: apache config
+      copy:
+        src: etc/apache2/sites-available/mw.trygvis.io-ssl.conf
+        dest: /etc/apache2/sites-available/mw.trygvis.io-ssl.conf
-- 
cgit v1.2.3