From 8e5e55034dde263e828b390e2f60210441ab2991 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@zarb.org>
Date: Mon, 29 Dec 2014 23:04:45 +0100
Subject: Switch to external httpd module

---
 roles/httpd/templates/vhost.conf          | 21 ---------------------
 roles/httpd/templates/vhost_redirect.conf | 16 ----------------
 2 files changed, 37 deletions(-)
 delete mode 100644 roles/httpd/templates/vhost.conf
 delete mode 100644 roles/httpd/templates/vhost_redirect.conf

(limited to 'roles/httpd/templates')

diff --git a/roles/httpd/templates/vhost.conf b/roles/httpd/templates/vhost.conf
deleted file mode 100644
index 21172c9..0000000
--- a/roles/httpd/templates/vhost.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<VirtualHost *:80>
-        {% if website_password is defined %}
-        <Location />
-
-            AuthType Basic
-            AuthName "Restricted access, contact OSAS for password"
-            AuthUserFile /etc/httpd/{{ website_url }}.htpasswd
-            Require valid-user
-        </Location>
-        {% endif %}
-
-        <Directory "{{ document_root }}">
-                AllowOverride All
-        </Directory>
-
-        ServerName {{ website_url }}
-        DocumentRoot {{ document_root }}
-        Include /etc/httpd/conf.d/{{ website_url}}.conf.d/*conf
-</VirtualHost>
-
-
diff --git a/roles/httpd/templates/vhost_redirect.conf b/roles/httpd/templates/vhost_redirect.conf
deleted file mode 100644
index 1c93343..0000000
--- a/roles/httpd/templates/vhost_redirect.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<VirtualHost *:80>
-        {% if website_password is defined %}
-        <Location />
-
-            AuthType Basic
-            AuthName "Restricted access, contact OSAS for password"
-            AuthUserFile /etc/httpd/{{ website_url }}.htpasswd
-            Require valid-user
-        </Location>
-        {% endif %}
-
-        ServerName {{ website_url }}
-        Redirect / {{ redirect }}
-</VirtualHost>
-
-
-- 
cgit