|
@@ -25,14 +25,28 @@ if [[ -n "${LDAP_SERVER:-}" ]]; then
|
|
/app/code/local_ldap.py >> /run/local.py
|
|
/app/code/local_ldap.py >> /run/local.py
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
+# create and merge any user local.py
|
|
|
|
+if [[ -f /app/data/customlocal.py ]]; then
|
|
|
|
+ echo -e "# Place custom local.py settings in this file\n" > /app/data/customlocal.py
|
|
|
|
+fi
|
|
|
|
+
|
|
|
|
+cat /app/data/customlocal.py >> /run/local.py
|
|
|
|
+
|
|
|
|
+# create and merge any user conf.json
|
|
|
|
+if [[ ! -f /app/data/conf.json ]]; then
|
|
|
|
+ echo "{}" > /app/data/conf.json
|
|
|
|
+fi
|
|
|
|
+
|
|
if [[ -n "${LDAP_SERVER:-}" ]]; then
|
|
if [[ -n "${LDAP_SERVER:-}" ]]; then
|
|
echo "=> Update conf.json with LDAP"
|
|
echo "=> Update conf.json with LDAP"
|
|
- sed -e "s/##APP_DOMAIN##/${APP_DOMAIN}/" /app/code/conf_ldap.json > /run/conf.json
|
|
|
|
|
|
+ node /app/code/json-merge.js /app/data/conf.json /app/code/conf_ldap.json
|
|
else
|
|
else
|
|
echo "=> Update conf.json"
|
|
echo "=> Update conf.json"
|
|
- sed -e "s/##APP_DOMAIN##/${APP_DOMAIN}/" /app/code/conf.json > /run/conf.json
|
|
|
|
|
|
+ node /app/code/json-merge.js /app/data/conf.json /app/code/conf.json
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
+/app/code/node_modules/.bin/json -I -f /app/data/conf.json -e "this.api = '${APP_ORIGIN}/api/v1/'"
|
|
|
|
+
|
|
echo "=> Update nginx.conf"
|
|
echo "=> Update nginx.conf"
|
|
sed -e "s,##APP_DOMAIN##,${APP_DOMAIN}," /app/code/nginx.conf > /run/nginx.conf
|
|
sed -e "s,##APP_DOMAIN##,${APP_DOMAIN}," /app/code/nginx.conf > /run/nginx.conf
|
|
|
|
|