Put the mailman.cfg in /etc instead of custom /config/ dir. (#39)
This commit is contained in:
@@ -19,7 +19,7 @@ EXPOSE 8001
|
|||||||
|
|
||||||
ENTRYPOINT ["/opt/run.sh"]
|
ENTRYPOINT ["/opt/run.sh"]
|
||||||
|
|
||||||
ENV MAILMAN_CONFIG_FILE /config/mailman.cfg
|
ENV MAILMAN_CONFIG_FILE /etc/mailman.cfg
|
||||||
|
|
||||||
RUN adduser -S mailman
|
RUN adduser -S mailman
|
||||||
|
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ hostname: $MM_HOSTNAME
|
|||||||
[archiver.hyperkitty]
|
[archiver.hyperkitty]
|
||||||
class: mailman_hyperkitty.Archiver
|
class: mailman_hyperkitty.Archiver
|
||||||
enable: yes
|
enable: yes
|
||||||
configuration: /config/mailman-hyperkitty.cfg
|
configuration: /etc/mailman-hyperkitty.cfg
|
||||||
|
|
||||||
[database]
|
[database]
|
||||||
class: $DATABASE_CLASS
|
class: $DATABASE_CLASS
|
||||||
|
|||||||
@@ -64,12 +64,8 @@ if [[ ! -v HYPERKITTY_URL ]]; then
|
|||||||
export HYPERKITTY_URL=http://mailman-web:8000/
|
export HYPERKITTY_URL=http://mailman-web:8000/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -d /config/ ]]; then
|
|
||||||
mkdir /config/
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Generate a basic mailman.cfg.
|
# Generate a basic mailman.cfg.
|
||||||
cat > /config/mailman.cfg <<EOF
|
cat > /etc/mailman.cfg <<EOF
|
||||||
[mta]
|
[mta]
|
||||||
incoming: mailman.mta.exim4.LMTP
|
incoming: mailman.mta.exim4.LMTP
|
||||||
outgoing: mailman.mta.deliver.deliver
|
outgoing: mailman.mta.deliver.deliver
|
||||||
@@ -88,7 +84,7 @@ hostname: $MM_HOSTNAME
|
|||||||
[archiver.hyperkitty]
|
[archiver.hyperkitty]
|
||||||
class: mailman_hyperkitty.Archiver
|
class: mailman_hyperkitty.Archiver
|
||||||
enable: yes
|
enable: yes
|
||||||
configuration: /config/mailman-hyperkitty.cfg
|
configuration: /etc/mailman-hyperkitty.cfg
|
||||||
|
|
||||||
[database]
|
[database]
|
||||||
class: $DATABASE_CLASS
|
class: $DATABASE_CLASS
|
||||||
@@ -98,7 +94,7 @@ EOF
|
|||||||
if [[ -e /opt/mailman/mailman-extra.cfg ]]
|
if [[ -e /opt/mailman/mailman-extra.cfg ]]
|
||||||
then
|
then
|
||||||
echo "Found configuration file at /opt/mailman/mailman-extra.cfg"
|
echo "Found configuration file at /opt/mailman/mailman-extra.cfg"
|
||||||
cat /opt/mailman/mailman-extra.cfg >> /config/mailman.cfg
|
cat /opt/mailman/mailman-extra.cfg >> /etc/mailman.cfg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@@ -114,7 +110,7 @@ if [[ -v HYPERKITTY_URL ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Generate a basic mailman-hyperkitty.cfg.
|
# Generate a basic mailman-hyperkitty.cfg.
|
||||||
cat > /config/mailman-hyperkitty.cfg <<EOF
|
cat > /etc/mailman-hyperkitty.cfg <<EOF
|
||||||
[general]
|
[general]
|
||||||
base_url: $HYPERKITTY_URL
|
base_url: $HYPERKITTY_URL
|
||||||
api_key: $HYPERKITTY_API_KEY
|
api_key: $HYPERKITTY_API_KEY
|
||||||
|
|||||||
Reference in New Issue
Block a user