From 60e6fc5fca18c5b503d112628e096d5099e50aad Mon Sep 17 00:00:00 2001
From: Paul <paul@zom.bi>
Date: Sun, 16 Aug 2020 23:35:23 +0200
Subject: [PATCH] Fix permissions for non-root user

---
 bin/entrypoint.sh | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
index 93b95ae..9239618 100755
--- a/bin/entrypoint.sh
+++ b/bin/entrypoint.sh
@@ -2,25 +2,19 @@
 
 if [ ! -f /data/mumo.ini ]
 then
-  cp /mumo/mumo.ini /data
-
-  sed -i 's/mumo.log/\/data\/mumo.log/' /data/mumo.ini
-  sed -i 's/modules\//\/data\/modules\//' /data/mumo.ini
-  sed -i 's/modules-enabled\//\/data\/modules-enabled\//' /data/mumo.ini
-
-  chmod a+rw /data/mumo.ini
-  cp -r /mumo/modules-available /data
+  cp -r /mumo/mumo.ini /mumo/modules /mumo/modules-available /data
   mkdir -p /data/modules-enabled
-
-  echo Created mumo default config data. Exiting.
-  exit 1
 fi
 
 # Mumo apparently refuses to read config from mounted dirs,
 # so we copy them ...
 cp -r /data/mumo.ini /mumo
-cp -r /data/modules /mumo # TODO: Add from git
-cp -r /data/modules-available /mumo
-cp -r /data/modules-enabled /mumo
 
-exec su mumo -c "python3 /mumo/mumo.py"
+# if additional configuration is defined, we will replace our local default config.
+[ -d /data/modules-enabled ] && cp -r /data/modules-enabled /mumo
+[ -d /data/modules ] && rm -rf /mumo/modules && cp -r /data/modules /mumo
+
+# make sure our dir is writable for the user
+chown mumo:mumo /mumo -R
+
+exec su mumo -c "python3 /mumo/mumo.py --app --ini /mumo/mumo.ini"