diff options
| author | Michael Scherer <misc@zarb.org> | 2014-12-29 23:04:45 +0100 |
|---|---|---|
| committer | Michael Scherer <misc@zarb.org> | 2014-12-29 23:04:45 +0100 |
| commit | 8e5e55034dde263e828b390e2f60210441ab2991 (patch) | |
| tree | 971d4251aa9a2c65fcfc8f64c33ae16204861ea5 /roles/httpd/templates | |
| parent | ce543b7cd386ccc8b60ae8d3e707961ac5d1e0d8 (diff) | |
Switch to external httpd module
Diffstat (limited to 'roles/httpd/templates')
| -rw-r--r-- | roles/httpd/templates/vhost.conf | 21 | ||||
| -rw-r--r-- | roles/httpd/templates/vhost_redirect.conf | 16 |
2 files changed, 0 insertions, 37 deletions
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> - - |