From 0a7bbc1e87510385960aa16e3c70f601ef255ffd Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sat, 9 Feb 2019 08:35:05 -0800 Subject: [PATCH 1/5] Fix typo --- core/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/README.md b/core/README.md index d941125..bd8ae2e 100644 --- a/core/README.md +++ b/core/README.md @@ -17,7 +17,7 @@ Configuration These are the variables that you MUST change before deploying: -- `HYPERKITT_API_KEY`: Hyperkitty's API Key, should be set to the same value as +- `HYPERKITTY_API_KEY`: Hyperkitty's API Key, should be set to the same value as set for the mailman-core. - `DATABASE_URL`: URL of the type From 7812e1018287e3d215ab46662a8035dd5f854eba Mon Sep 17 00:00:00 2001 From: worikgh <5387413+worikgh@users.noreply.github.com> Date: Fri, 15 Feb 2019 11:39:59 +1300 Subject: [PATCH 2/5] Make it clear how to relay emails in postfix (#306) * Make it clear how to relay emails in postfix * Line length set to eighty characters for the new text --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b17a4a5..1e3a9bd 100644 --- a/README.md +++ b/README.md @@ -371,12 +371,10 @@ smtp_port: $SMTP_PORT configuration: python:mailman.config.exim4 ``` - -To use [Postfix][12], it should be set up to relay emails from -`172.19.199.2` and `172.19.199.3`. The mailman specific configuration is -mentioned below which you should add to your `main.cf` configuration file, -which is typically at `/etc/postfix/main.cf` on Debian-based operating -systems: +To use [Postfix][12], edit the `main.cf` configuration file, which is typically +at `/etc/postfix/main.cf` on Debian-based operating systems. Add `172.19.199.2` +and `172.19.199.3` to `mynetworks` so it will relay emails from the containers +and add the following configuration lines: ``` # main.cf From a053f570de1504f0bd9656529646d414f16b4aa8 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sun, 17 Feb 2019 13:02:56 -0800 Subject: [PATCH 3/5] Bump versions of Postorius to latest and fix urls.py --- postorius/Dockerfile | 4 ++-- postorius/mailman-web/urls.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 6357a3b..6f5050e 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -15,8 +15,8 @@ RUN set -ex \ postgresql-dev mariadb-dev \ && apk add --no-cache --virtual .mailman-rundeps bash \ postgresql-client mysql-client py-mysqldb curl mailcap \ - && pip install -U Django>=1.11 pip \ - && pip install postorius==1.2.0a1 \ + && pip install -U Django==2.1.5 pip \ + && pip install postorius==1.2.3 \ uwsgi \ psycopg2 \ dj-database-url \ diff --git a/postorius/mailman-web/urls.py b/postorius/mailman-web/urls.py index e7bb6be..804b9e3 100644 --- a/postorius/mailman-web/urls.py +++ b/postorius/mailman-web/urls.py @@ -30,5 +30,5 @@ urlpatterns = [ url(r'', include('django_mailman3.urls')), url(r'^accounts/', include('allauth.urls')), # Django admin - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), ] From 89d9a0f626cb65bdfabe91781588297ad2cd70dc Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sun, 24 Feb 2019 22:05:14 -0800 Subject: [PATCH 4/5] Pin Django to 2.1.5 --- postorius/Dockerfile.dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 13b0c42..479d9c4 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -26,7 +26,7 @@ RUN set -ex \ psycopg2 \ dj-database-url \ mysqlclient \ - && pip install -U django>=1.11\ + && pip install -U django==2.1.5\ && pip install -U git+https://gitlab.com/mailman/django-mailman3@${DJ_MM3_REF} \ && apk del .build-deps \ && addgroup -S mailman \ From fa48d9792c9a807d6da6b1ccbbb4a455a63ac3df Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Thu, 28 Feb 2019 17:41:54 -0800 Subject: [PATCH 5/5] Remove hyperkitty related jobs in uwsgi config. --- postorius/mailman-web/uwsgi.ini | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/postorius/mailman-web/uwsgi.ini b/postorius/mailman-web/uwsgi.ini index 4a24c52..543eedd 100644 --- a/postorius/mailman-web/uwsgi.ini +++ b/postorius/mailman-web/uwsgi.ini @@ -21,28 +21,8 @@ threads = 2 uid = mailman gid = mailman -# Setup the django_q related worker processes. -attach-daemon = ./manage.py qcluster - -# Setup hyperkitty's cron jobs. -unique-cron = -1 -1 -1 -1 -1 ./manage.py runjobs minutely -unique-cron = -15 -1 -1 -1 -1 ./manage.py runjobs quarter_hourly -unique-cron = 0 -1 -1 -1 -1 ./manage.py runjobs hourly -unique-cron = 0 0 -1 -1 -1 ./manage.py runjobs daily -unique-cron = 0 0 1 -1 -1 ./manage.py runjobs monthly -unique-cron = 0 0 -1 -1 0 ./manage.py runjobs weekly -unique-cron = 0 0 1 1 -1 ./manage.py runjobs yearly - # Setup the request log. req-logger = file:/opt/mailman-web-data/logs/uwsgi.log -# Log cron seperately. -logger = cron file:/opt/mailman-web-data/logs/uwsgi-cron.log -log-route = cron uwsgi-cron - -# Log qcluster commands seperately. -logger = qcluster file:/opt/mailman-web-data/logs/uwsgi-qcluster.log -log-route = qcluster uwsgi-daemons - # Last log and it logs the rest of the stuff. logger = file:/opt/mailman-web-data/logs/uwsgi-error.log