[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>
This commit is contained in:
Michal Konecny 2024-03-15 12:01:44 +01:00
parent 93fbacb1fd
commit ad315c5536
3 changed files with 21 additions and 9 deletions

View file

@ -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>

View file

@ -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),
]

View file

@ -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