Commit e53dd8b4 authored by putro's avatar putro
Browse files

Merge branch 'master' of git.autistici.org:ai3/docker/mailman

parents d8d2b2ab 822d4ca2
Pipeline #4295 passed with stages
in 3 minutes and 2 seconds
......@@ -26,17 +26,11 @@ PACKAGES="
APACHE_MODULES_ENABLE="
cgi
"
export APACHE_MODULES_ENABLE
# Config snippets to enable for Apache.
APACHE_CONFIG_ENABLE=
export APACHE_CONFIG_ENABLE
# Sites to enable.
APACHE_SITES="
mailman
"
export APACHE_SITES
# The default bitnami/minideb image defines an 'install_packages'
# command which is just a convenient helper. Define our own in
......@@ -61,7 +55,8 @@ install_packages ${BUILD_PACKAGES} ${PACKAGES}
rsync -a /tmp/conf/ /etc/
# Setup Apache.
/usr/local/bin/setup-apache.sh
a2enmod -q ${APACHE_MODULES_ENABLE}
a2ensite ${APACHE_SITES}
# Create writable storage mountpoint. The situation with /var/lib/mailman
# is complex, there are "data" files and mailman files, and Debian links
......
......@@ -10,7 +10,7 @@ import smtplib
parser = optparse.OptionParser()
parser.add_option('-i', dest='ignored', action='sore_true')
parser.add_option('-i', dest='ignored', action='store_true')
parser.add_option('-f', dest='from_addr', default='nobody')
parser.add_option('--server', dest='server', default='localhost')
parser.add_option('--port', dest='server_port', type='int', default=25)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment