From 96b5e73a99f5781c341ff5399307c3ccdee85fd6 Mon Sep 17 00:00:00 2001
From: Michal Konecny <mkonecny@redhat.com>
Date: Wed, 27 Mar 2024 17:02:59 +0100
Subject: [PATCH] [mailman3] Add compress step

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
---
 roles/mailman3/defaults/main.yml        |  1 +
 roles/mailman3/tasks/main.yml           | 23 +++++++++++++++++------
 roles/mailman3/templates/mailman.cfg.j2 |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/roles/mailman3/defaults/main.yml b/roles/mailman3/defaults/main.yml
index 0da86332fe..3336b927a5 100644
--- a/roles/mailman3/defaults/main.yml
+++ b/roles/mailman3/defaults/main.yml
@@ -6,6 +6,7 @@ mailman_rest_api_user: restadmin
 mailman_rest_api_pass: changeme
 mailman_rest_api_workers: 2
 mailman_log_directory: /var/log/mailman3
+mailman_log_level: debug
 mailman_log_items:
   - archiver
   - bounce
diff --git a/roles/mailman3/tasks/main.yml b/roles/mailman3/tasks/main.yml
index 55375bea96..c7eee857b9 100644
--- a/roles/mailman3/tasks/main.yml
+++ b/roles/mailman3/tasks/main.yml
@@ -152,8 +152,8 @@
   ansible.builtin.file:
     path: "{{ mailman_webui_basedir }}/{{ item }}"
     state: directory
-    owner: root
-    group: root
+    owner: mailman
+    group: mailman
     mode: 0755
   with_items:
     - static
@@ -165,8 +165,8 @@
   ansible.builtin.file:
     path: "{{ mailman_webui_basedir }}/static-fedora/hyperkitty/img"
     state: directory
-    owner: root
-    group: root
+    owner: mailman
+    group: mailman
     mode: 0755
   tags:
     - mailman
@@ -176,8 +176,8 @@
   ansible.builtin.file:
     path: "{{ mailman_webui_basedir }}/templates/{{ item }}"
     state: directory
-    owner: root
-    group: root
+    owner: mailman
+    group: mailman
     mode: 0755
   with_items:
     - hyperkitty
@@ -312,6 +312,17 @@
   when:
     - static_root_dir is changed
 
+- name: Compress static files
+  ansible.builtin.command:
+    cmd: mailman-web compress
+    chdir: /etc/mailman3
+  become_user: mailman
+  tags:
+    - mailman
+    - hyperkitty
+  when:
+    - static_root_dir is changed
+
 - name: Systemd unit to start postorius/hyperkitty through gunicorn
   ansible.builtin.template:
     src: mailmanweb.service.j2
diff --git a/roles/mailman3/templates/mailman.cfg.j2 b/roles/mailman3/templates/mailman.cfg.j2
index bff84c85d2..6df3c18fee 100644
--- a/roles/mailman3/templates/mailman.cfg.j2
+++ b/roles/mailman3/templates/mailman.cfg.j2
@@ -44,7 +44,7 @@ workers: {{ mailman_rest_api_workers }}
 {% for item in mailman_log_items %}
 
 [loggin.{{ item }}]
-level: info
+level: {{ mailman_log_level }}
 path: {{ mailman_log_directory }}/{{ item }}.log
 
 {% endfor %}