Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Point MAILMAN_CONFIG_FILE to the configuration mailman will use.

Browse Source
This commit is contained in:
Abhilash Raj
2017-04-26 10:05:52 -07:00
committed by Abhilash Raj
parent d5be8baa32
commit ac7134801d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Dockerfile
View File

@@ -22,4 +22,4 @@ EXPOSE 8001
ENTRYPOINT ["/opt/run.sh"]
CMD ["/usr/local/bin/master", "-C", "/config/mailman.cfg"]
CMD ["/usr/local/bin/master"]

7
core/assets/run.sh
View File

@@ -97,10 +97,10 @@ class: $DATABASE_CLASS
url: $DATABASE_URL
EOF
if [[ -e /opt/mailman/mailman.cfg ]]
if [[ -e /opt/mailman/mailman-extra.cfg ]]
then
echo "Found configuration file at /opt/mailman/mailman.cfg"
cat /opt/mailman/mailman.cfg >> /config/mailman.cfg
echo "Found configuration file at /opt/mailman/mailman-extra.cfg"
cat /opt/mailman/mailman-extra.cfg >> /config/mailman.cfg
fi
@@ -122,5 +122,6 @@ base_url: $HYPERKITTY_URL
api_key: $HYPERKITTY_API_KEY
EOF
export MAILMAN_CONFIG_FILE=/config/mailman.cfg
exec "$@"