From 7aaa34b8d64543b24f4063810c4302d742b6b0cd Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 26 Aug 2016 21:45:11 -0700
Subject: [PATCH] merge user config file

---
 app.ini.template | 2 ++
 start.sh         | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app.ini.template b/app.ini.template
index 863090e..03b5c8a 100644
--- a/app.ini.template
+++ b/app.ini.template
@@ -50,3 +50,5 @@ ENABLE_NOTIFY_MAIL = true
 MODE = console
 ; used for xorm.log
 ROOT_PATH = /run/gogs
+
+
diff --git a/start.sh b/start.sh
index a0bb0a4..fe41425 100755
--- a/start.sh
+++ b/start.sh
@@ -65,6 +65,9 @@ sed -e "s/##DOMAIN/${APP_DOMAIN}/g" \
     -e "s/##SECRET_KEY/$(pwgen -1 -s)/g" \
     /home/git/app.ini.template > "/run/gogs/app.ini"
 
+# merge any user config file
+[[ -f /app/data/app.ini ]] && echo "/app/data/app.ini" >> "/run/gogs/app.ini"
+
 mkdir -p /app/data/repository /app/data/ssh
 
 chown -R git:git /app/data /run/gogs