From dfdae74445b31d6c2f1bd19fd930732dd868c569 Mon Sep 17 00:00:00 2001 From: Thomas Constans Date: Tue, 18 Feb 2025 12:17:49 +0100 Subject: [PATCH] fix modules enabling code --- defaults/main.yml | 12 ++++++------ tasks/main.yml | 16 ++++++++-------- templates/vhost.conf.jj | 2 ++ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 8ca40a2..f583e78 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,9 +16,9 @@ apache_use_stats: true apache_user: "{{ apache_server_name | regex_search( '([^.]+)' ) }}" apache_use_database: false apache_modules_list: - headers - http2 - rewrite - proxy - proxy_http - proxy_fcgi + - headers + - http2 + - rewrite + - proxy + - proxy_http + - proxy_fcgi diff --git a/tasks/main.yml b/tasks/main.yml index 8be0d36..3005509 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -39,6 +39,14 @@ - "{{ apache_base_dir }}/session" - "{{ apache_base_dir }}/wsdlcache" +- name: enable some modules + when: ansible_os_family == 'Debian' + tags: modules + community.general.apache2_module: + state: present + name: "{{ item }}" + loop: "{{ apache_modules_list }}" + - name: dns setup include_tasks: dns.yml when: apache_use_dns @@ -72,11 +80,3 @@ when: apache_use_stats tags: stats - -- name: enable some modules - when: ansible_os_family == 'Debian' - tags: modules - community.general.apache2_module: - state: present - name: "{{ item }}" - loop: "{{ apache_modules list }}" \ No newline at end of file diff --git a/templates/vhost.conf.jj b/templates/vhost.conf.jj index 0557f12..b88038d 100644 --- a/templates/vhost.conf.jj +++ b/templates/vhost.conf.jj @@ -11,10 +11,12 @@ Options +indexes {%if apache_use_ssl %} + RewriteEngine on RewriteCond %{HTTPS} off RewriteCond %{REQUEST_URI} "!^/\.well-known" RewriteRule (.*) https://%{SERVER_NAME}$1 [R,L] + {%endif %}