summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/apache_server/tasks/main.yml1
-rw-r--r--roles/apache_server/templates/virtualhost.conf.tmpl5
2 files changed, 6 insertions, 0 deletions
diff --git a/roles/apache_server/tasks/main.yml b/roles/apache_server/tasks/main.yml
index e01d01e..c4f348a 100644
--- a/roles/apache_server/tasks/main.yml
+++ b/roles/apache_server/tasks/main.yml
@@ -67,6 +67,7 @@
name: "{{ item }}"
with_items:
- ssl
+ - rewrite
- name: create dirs for static site contents
file:
diff --git a/roles/apache_server/templates/virtualhost.conf.tmpl b/roles/apache_server/templates/virtualhost.conf.tmpl
index 8d069ce..f8d4c47 100644
--- a/roles/apache_server/templates/virtualhost.conf.tmpl
+++ b/roles/apache_server/templates/virtualhost.conf.tmpl
@@ -8,6 +8,10 @@
ErrorLog /var/log/apache2/{{ item.domain }}/error.log
CustomLog /var/log/apache2/{{ item.domain }}/access.log combined
<Directory /srv/http/{{ item.domain }}>
+{% if item.redirect|default(false) %}
+ Redirect permanent / "https://{{ item.redirect }}/"
+ Require all granted
+{% else %}
{% if item.letsencrypt|default(false) %}
Redirect permanent / "https://{{ item.domain }}/"
Require all granted
@@ -23,6 +27,7 @@
Require all granted
{% endif %}
{% endif %}
+{% endif %}
</Directory>
Alias /.well-known/ /srv/letsencrypt/{{ item.domain }}/