Merge branch 'master' into master

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

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

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 \

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 \

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

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