Merge branch 'buster' into 'master'

Buster

Closes #9

See merge request !4

Dockerfile

-FROM registry.git.autistici.org/ai3/docker/apache2-base:master
+FROM registry.git.autistici.org/ai3/docker/apache2-base:buster
 
 COPY conf /tmp/conf
 COPY build.sh /tmp/build.sh

build.sh

@@ -6,30 +6,31 @@
 # Packages that are only used to build the site. These will be
 # removed once we're done.
 BUILD_PACKAGES="
-        git
-        rsync
+    git
+    rsync
 "
 
 # Packages required to serve the website and run the services, in
 # addition to those already installed by the base apache2 image.
 PACKAGES="
-	mailman
-	locales
-        python-pip
-        python-setuptools
-        python-flask
-        ai-sso-python
-        findutils
+    mailman
+    locales
+    python-pip
+    python-setuptools
+    python-flask
+    python-wheel
+    ai-sso-python
+    findutils
 "
 
 # Apache modules to enable.
 APACHE_MODULES_ENABLE="
-	cgi
+    cgi
 "
 
 # Sites to enable.
 APACHE_SITES="
-	mailman
+    mailman
 "
 
 # The default bitnami/minideb image defines an 'install_packages'
@@ -49,6 +50,13 @@ mailman mailman/default_server_language select en
 mailman mailman/site_languages multiselect ar (Arabic), ca (Catalan), cs (Czech), da (Danish), de (German), en (English), es (Spanish), et (Estonian), eu (Basque), fi (Finnish), fr (French), hr (Croatian), hu (Hungarian), ia (Interlingua), it (Italian), ja (Japanese), ko (Korean), lt (Lithuanian), nl (Dutch), no (Norwegian), pl (Polish), pt (Portuguese), pt_BR (Brasilian Portuguese), ro (Romanian), ru (Russian), sl (Slovenian), sr (Serbian), sv (Swedish), tr (Turkish), uk (Ukrainian), vi (Vietnamese), zh_CN (Chinese - China), zh_TW (Chinese - Taiwan)
 EOF
 
+# Always prefer mailman from ai3
+cat > /etc/apt/preferences.d/90mailman <<EOF
+Package: mailman
+Pin: release n=ai3
+Pin-Priority: 1001
+EOF
+
 install_packages ${BUILD_PACKAGES} ${PACKAGES}
 
 # Install the configuration, overlayed over /etc.