summaryrefslogtreecommitdiff
path: root/roles/apache_server/templates/virtualhost.conf.tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'roles/apache_server/templates/virtualhost.conf.tmpl')
-rw-r--r--roles/apache_server/templates/virtualhost.conf.tmpl9
1 files changed, 8 insertions, 1 deletions
diff --git a/roles/apache_server/templates/virtualhost.conf.tmpl b/roles/apache_server/templates/virtualhost.conf.tmpl
index e2dc19f..1fa060a 100644
--- a/roles/apache_server/templates/virtualhost.conf.tmpl
+++ b/roles/apache_server/templates/virtualhost.conf.tmpl
@@ -8,8 +8,15 @@
ErrorLog /var/log/apache2/{{ item.domain }}/error.log
CustomLog /var/log/apache2/{{ item.domain }}/access.log combined
<Directory /srv/http/{{ item.domain }}>
- Options +SymlinksIfOwnerMatch +Indexes
+ Options +SymlinksIfOwnerMatch +Indexes +MultiViews
+{% if item.htpasswd is defined %}
+ AuthType Basic
+ AuthName "{{ item.htpasswd_name }}"
+ AuthUserFile "/srv/http/{{ item.domain }}.htpasswd"
+ Require valid-user
+{% else %}
AllowOverride AuthConfig
Require all granted
+{% endif %}
</Directory>
</VirtualHost>