Merge ~pjdc/mailman3-web-charm/+git/mailman3-web-charm:fix-config-writing-for-package-fragility into mailman3-web-charm:master

Proposed by Paul Collins
Status: Merged
Approved by: David Lawson
Approved revision: 25288644a1abe8b764fd114cd85c80c820afdafa
Merged at revision: 1b9dde916c961583687af17d9edc4429c1da5357
Proposed branch: ~pjdc/mailman3-web-charm/+git/mailman3-web-charm:fix-config-writing-for-package-fragility
Merge into: mailman3-web-charm:master
Diff against target: 19 lines (+5/-2)
1 file modified
templates/mailman-web.tmpl (+5/-2)
Reviewer Review Type Date Requested Status
Mailman3 charm maintainers Pending
Review via email: mp+358416@code.launchpad.net

Commit message

mailman-web.tmpl: fix ADMINS for package fragility cf. bug#1802036

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 1b9dde916c961583687af17d9edc4429c1da5357

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/mailman-web.tmpl b/templates/mailman-web.tmpl
2index 329f94e..3938dd2 100644
3--- a/templates/mailman-web.tmpl
4+++ b/templates/mailman-web.tmpl
5@@ -4,9 +4,12 @@
6 # SECURITY WARNING: keep the secret key used in production secret!
7 SECRET_KEY = '{{ config.django_secret_key }}'
8
9+# Note that the package insists that a) the name be "Mailman Suite Admin"
10+# (in single quotes, so the instance above will not cause a problem)
11+# and b) the closing paren be at column 0 (https://launchpad.net/bugs/1802036).
12 ADMINS = (
13- ('Mailman Web Admin', 'root@{{ config.domain }}'),
14- )
15+ ('Mailman Suite Admin', 'root@{{ config.domain }}'),
16+)
17
18 # Hosts/domain names that are valid for this site; required if DEBUG is False
19 # See https://docs.djangoproject.com/en/1.8/ref/settings/#allowed-hosts

Subscribers

People subscribed via source and target branches