From f920f88165593bcb0da796a1f15a068ebc0e85fb Mon Sep 17 00:00:00 2001
From: Abhilash Raj <maxking@users.noreply.github.com>
Date: Sun, 28 May 2017 13:17:13 -0700
Subject: [PATCH] Put the mailman.cfg in /etc instead of custom /config/ dir.
 (#39)

---
 core/Dockerfile    |  2 +-
 core/README.md     |  2 +-
 core/assets/run.sh | 12 ++++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/Dockerfile b/core/Dockerfile
index 3d1a593..fa30fbb 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -19,7 +19,7 @@ EXPOSE 8001
 
 ENTRYPOINT ["/opt/run.sh"]
 
-ENV MAILMAN_CONFIG_FILE /config/mailman.cfg
+ENV MAILMAN_CONFIG_FILE /etc/mailman.cfg
 
 RUN adduser -S mailman
 
diff --git a/core/README.md b/core/README.md
index 93d68ee..a3df964 100644
--- a/core/README.md
+++ b/core/README.md
@@ -92,7 +92,7 @@ hostname: $MM_HOSTNAME
 [archiver.hyperkitty]
 class: mailman_hyperkitty.Archiver
 enable: yes
-configuration: /config/mailman-hyperkitty.cfg
+configuration: /etc/mailman-hyperkitty.cfg
 
 [database]
 class: $DATABASE_CLASS
diff --git a/core/assets/run.sh b/core/assets/run.sh
index 4aa1cbe..c1491d6 100755
--- a/core/assets/run.sh
+++ b/core/assets/run.sh
@@ -64,12 +64,8 @@ if [[ ! -v HYPERKITTY_URL ]]; then
 	export HYPERKITTY_URL=http://mailman-web:8000/
 fi
 
-if [[ ! -d /config/ ]]; then
-	mkdir /config/
-fi
-
 # Generate a basic mailman.cfg.
-cat > /config/mailman.cfg <<EOF
+cat > /etc/mailman.cfg <<EOF
 [mta]
 incoming: mailman.mta.exim4.LMTP
 outgoing: mailman.mta.deliver.deliver
@@ -88,7 +84,7 @@ hostname: $MM_HOSTNAME
 [archiver.hyperkitty]
 class: mailman_hyperkitty.Archiver
 enable: yes
-configuration: /config/mailman-hyperkitty.cfg
+configuration: /etc/mailman-hyperkitty.cfg
 
 [database]
 class: $DATABASE_CLASS
@@ -98,7 +94,7 @@ EOF
 if [[ -e /opt/mailman/mailman-extra.cfg ]]
 then
 	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
 
 
@@ -114,7 +110,7 @@ if [[ -v HYPERKITTY_URL ]]; then
 fi
 
 # Generate a basic mailman-hyperkitty.cfg.
-cat > /config/mailman-hyperkitty.cfg <<EOF
+cat > /etc/mailman-hyperkitty.cfg <<EOF
 [general]
 base_url: $HYPERKITTY_URL
 api_key: $HYPERKITTY_API_KEY