flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-07 16:06:14 +00:00
Code Issues Releases Wiki Activity

Rework php cfg handling a bit (#135)

Browse Source 
* make sed matching a bit more strict
* append settings if not found instead of throwing error

fixes #133
This commit is contained in:
Felix Bartels 2019-03-30 19:37:19 +01:00 committed by GitHub
parent 905bdf0edd
commit 48e22da9d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -58,7 +58,7 @@ build-simple:
build-base: build-base:
component=base make build component=base make build
build-core: build-core: build-base
component=core make build component=core make build
build-konnect: build-konnect:
@ -70,7 +70,7 @@ build-kwmserver:
build-ldap-demo: build-ldap-demo:
component=ldap_demo make build-simple component=ldap_demo make build-simple
build-meet: build-meet: build-base
component=meet make build component=meet make build
build-playground: build-playground:
@ -91,7 +91,7 @@ build-utils: build-core
build-web: build-web:
component=web make build-simple component=web make build-simple
build-webapp: build-webapp: build-base
component=webapp make build component=webapp make build
build-zpush: build-zpush:

28
webapp/start.sh
View File

@ -13,22 +13,22 @@ php_cfg_gen() {
local cfg_setting="$2" local cfg_setting="$2"
local cfg_value="$3" local cfg_value="$3"
if [ -e "$cfg_file" ]; then if [ -e "$cfg_file" ]; then
if grep -q "$cfg_setting" "$cfg_file"; then echo "Setting $cfg_setting = $cfg_value in $cfg_file"
echo "Setting $cfg_setting = $cfg_value in $cfg_file" if ! grep -q "$cfg_setting" "$cfg_file"; then
case $cfg_value in echo "WARNING: Config option $cfg_setting not found in $cfg_file! You may have misspelled the confing setting."
true|TRUE|false|FALSE) echo "define('$cfg_setting', '$cfg_value');" >> "$cfg_file"
echo boolean value
sed -ri "s#(\s*define).+${cfg_setting}.+#\tdefine(\x27${cfg_setting}\x27, ${cfg_value}\);#g" "$cfg_file"
;;
*)
sed -ri "s#(\s*define).+${cfg_setting}.+#\tdefine(\x27${cfg_setting}\x27, \x27${cfg_value}\x27\);#g" "$cfg_file"
;;
esac
else
echo "Error: Config option $cfg_setting not found in $cfg_file"
cat "$cfg_file" cat "$cfg_file"
exit 1 return
fi fi
case $cfg_value in
true|TRUE|false|FALSE)
echo boolean value
sed -ri "s#(\s*define).+${cfg_setting}'.+#\tdefine(\x27${cfg_setting}\x27, ${cfg_value}\);#g" "$cfg_file"
;;
*)
sed -ri "s#(\s*define).+${cfg_setting}'.+#\tdefine(\x27${cfg_setting}\x27, \x27${cfg_value}\x27\);#g" "$cfg_file"
;;
esac
else else
echo "Error: Config file $cfg_file not found. Plugin not installed?" echo "Error: Config file $cfg_file not found. Plugin not installed?"
local dir local dir