From 4b485d420caeb85035cfcca4bb9f84413d369b7f Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@2li.ch>
Date: Fri, 3 Nov 2017 17:40:10 +0100
Subject: [PATCH] update the ansible role

---
 ansible/roles/web_AI-5/files/000-default.conf | 38 +++++++++++++++++++
 ansible/roles/web_AI-5/tasks/main.yml         | 13 ++++---
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 ansible/roles/web_AI-5/files/000-default.conf

diff --git a/ansible/roles/web_AI-5/files/000-default.conf b/ansible/roles/web_AI-5/files/000-default.conf
new file mode 100644
index 0000000..d56948f
--- /dev/null
+++ b/ansible/roles/web_AI-5/files/000-default.conf
@@ -0,0 +1,38 @@
+WSGIScriptAlias / /vagrant/django/webshop/webshop/wsgi.py
+WSGIPythonPath /vagrant/django/webshop/
+
+<VirtualHost *:80>
+        # The ServerName directive sets the request scheme, hostname and port that
+        # the server uses to identify itself. This is used when creating
+        # redirection URLs. In the context of virtual hosts, the ServerName
+        # specifies what hostname must appear in the request's Host: header to
+        # match this virtual host. For the default virtual host (this file) this
+        # value is not decisive as it is used as a last resort host regardless.
+        # However, you must set it for any further virtual host explicitly.
+        #ServerName www.example.com
+
+        ServerAdmin webmaster@localhost
+        <Directory /vagrant/django/webshop/webshop>
+        <Files wsgi.py>
+        Require all granted
+        </Files>
+        </Directory>
+
+        # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
+        # error, crit, alert, emerg.
+        # It is also possible to configure the loglevel for particular
+        # modules, e.g.
+        #LogLevel info ssl:warn
+
+        ErrorLog ${APACHE_LOG_DIR}/error.log
+        CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+        # For most configuration files from conf-available/, which are
+        # enabled or disabled at a global level, it is possible to
+        # include a line for only one particular virtual host. For example the
+        # following line enables the CGI configuration for this host only
+        # after it has been globally disabled with "a2disconf".
+        #Include conf-available/serve-cgi-bin.conf
+</VirtualHost>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/ansible/roles/web_AI-5/tasks/main.yml b/ansible/roles/web_AI-5/tasks/main.yml
index 32a619f..985c193 100644
--- a/ansible/roles/web_AI-5/tasks/main.yml
+++ b/ansible/roles/web_AI-5/tasks/main.yml
@@ -2,13 +2,14 @@
 - include: tasks/apt_install.yml
 - include: tasks/ufw_tcp.yml
 
-- name: Configure Apache AllowOverride All
-  replace:
-    dest=/etc/apache2/apache2.conf
-    regexp='(<[dD]irectory /var/www/>[^<]*)AllowOverride None'
-    replace='\1AllowOverride All'
-
 - include: mariadb.yml
 
+- name: Copy apache config
+  copy: src=000-default.conf
+        dest=/etc/apache2/site-available/
+        owner=root
+        group=root
+        mode=655
+
 - name: Restart apache service
   service: name=apache2 state=restarted