From ad315c5536788ded4f1aa920c9eaf420c7fa107c Mon Sep 17 00:00:00 2001
From: Michal Konecny <mkonecny@redhat.com>
Date: Fri, 15 Mar 2024 12:01:44 +0100
Subject: [PATCH] [mailman] Fix the post-update.sh script

Fixes for the post-update.sh script for mailman:
* add missing dependencies
* Use correct template type for navbar-brand
* Fix urls.py for postorius
* Add settings_admin.py as it is needed for db migration

Signed-off-by: Michal Konecny <mkonecny@redhat.com>
---
 roles/mailman/files/mailman3_navbar-brand.html |  5 +++++
 roles/mailman/files/mailman3_urls.py           | 15 +++++++--------
 roles/mailman/tasks/main.yml                   | 10 +++++++++-
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 roles/mailman/files/mailman3_navbar-brand.html

diff --git a/roles/mailman/files/mailman3_navbar-brand.html b/roles/mailman/files/mailman3_navbar-brand.html
new file mode 100644
index 0000000000..d44999aadd
--- /dev/null
+++ b/roles/mailman/files/mailman3_navbar-brand.html
@@ -0,0 +1,5 @@
+{% load static %}
+<a class="navbar-brand" href="{% url 'hk_root' %}"
+   title="{{ site_name|title }}" style="padding:8px 15px">
+    <img alt="{{ site_name|title }}" src="{% static 'logo-hyperkitty-fedora.png' %}" />
+</a>
diff --git a/roles/mailman/files/mailman3_urls.py b/roles/mailman/files/mailman3_urls.py
index 2d7a187880..3859278a16 100644
--- a/roles/mailman/files/mailman3_urls.py
+++ b/roles/mailman/files/mailman3_urls.py
@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import include, url
+from django.urls import include, re_path, reverse_lazy
 from django.contrib import admin
 
-from django.core.urlresolvers import reverse_lazy
 from django.views.generic import RedirectView
 
 urlpatterns = [
-    url(r'^$', RedirectView.as_view(
+    re_path(r'^$', RedirectView.as_view(
         url=reverse_lazy('list_index'),
         permanent=True)),
-    url(r'^admin/', include('postorius.urls')),
-    url(r'^archives/', include('hyperkitty.urls')),
-    url(r'', include('django_mailman3.urls')),
-    url(r'^accounts/', include('allauth.urls')),
-    url(r'^django-admin/', admin.site.urls),
+    re_path(r'^admin/', include('postorius.urls')),
+    re_path(r'^archives/', include('hyperkitty.urls')),
+    re_path(r'', include('django_mailman3.urls')),
+    re_path(r'^accounts/', include('allauth.urls')),
+    re_path(r'^django-admin/', admin.site.urls),
 ]
diff --git a/roles/mailman/tasks/main.yml b/roles/mailman/tasks/main.yml
index 84828adc3b..cfd1cb6c0f 100644
--- a/roles/mailman/tasks/main.yml
+++ b/roles/mailman/tasks/main.yml
@@ -152,6 +152,8 @@
   - httpd
   - python3-pylibmc
   - python3-dnf-plugin-post-transaction-actions
+  - python3-psycopg2
+  - sassc
   tags:
   - packages
   - mailman
@@ -347,7 +349,6 @@
   tags:
   - config
   - mailman
-  when: env == 'production'
 
 - name: install the hyperkitty settings test file
   copy: src=settings_test.py
@@ -482,6 +483,13 @@
   copy: src=navbar-brand.html
         dest="{{ mailman_webui_basedir }}/templates/hyperkitty/navbar-brand.html"
   tags: mailman
+  when: env == 'production'
+
+- name: install our fedora-specific brand template override
+  copy: src=mailman3_navbar-brand.html
+        dest="{{ mailman_webui_basedir }}/templates/hyperkitty/navbar-brand.html"
+  tags: mailman
+  when: env == 'staging'
 
 - name: install our fedora-specific page headers
   copy: src=headers.html