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.tmpl5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/apache_server/templates/virtualhost.conf.tmpl b/roles/apache_server/templates/virtualhost.conf.tmpl
index f8d4c47..1e14db5 100644
--- a/roles/apache_server/templates/virtualhost.conf.tmpl
+++ b/roles/apache_server/templates/virtualhost.conf.tmpl
@@ -50,6 +50,10 @@
CustomLog /var/log/apache2/{{ item.domain }}/access.log combined
<Directory /srv/http/{{ item.domain }}>
Options +SymlinksIfOwnerMatch +Indexes +MultiViews
+{% if item.redirect|default(false) %}
+ Redirect permanent / "https://{{ item.redirect }}/"
+ Require all granted
+{% else %}
{% if item.htpasswd is defined %}
AuthType Basic
AuthName "{{ item.htpasswd_name }}"
@@ -59,6 +63,7 @@
AllowOverride AuthConfig
Require all granted
{% endif %}
+{% endif %}
</Directory>
SSLEngine on