mirror of
				https://github.com/zokradonh/kopano-docker
				synced 2025-10-31 10:27:14 +00:00 
			
		
		
		
	Fix quoting of meet settings (#229)
* add on the fly debugging to meet container * fix quoting of settings fixes #228
This commit is contained in:
		
							parent
							
								
									db63ee39cb
								
							
						
					
					
						commit
						4ddb0c6da7
					
				| @ -42,7 +42,6 @@ RUN \ | ||||
|     echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_MEET_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ | ||||
|     # install | ||||
|     apt-get update && \ | ||||
|     set -x && \ | ||||
|     # TODO mime-support could be remove once its an official dependency of kopano-kwebd | ||||
|     apt-get install --no-install-recommends -y \ | ||||
|         mime-support \ | ||||
| @ -51,7 +50,6 @@ RUN \ | ||||
|         ${ADDITIONAL_KOPANO_PACKAGES} \ | ||||
|         && \ | ||||
|     cp /usr/share/doc/kopano-meet-webapp/config.json.in /usr/share/kopano-kweb/www/config/kopano/meet.json && \ | ||||
|     set +x && \ | ||||
|     rm -rf /var/cache/apt /var/lib/apt/lists | ||||
| 
 | ||||
| ENV KOPANO_LOCALE="de_DE.UTF-8" | ||||
|  | ||||
| @ -3,6 +3,7 @@ | ||||
| ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""} | ||||
| 
 | ||||
| set -eu # unset variables are errors & non-zero return values exit the whole script | ||||
| [ "$DEBUG" ] && set -x | ||||
| 
 | ||||
| if [ ! -e /kopano/"$SERVICE_TO_START".py ]; then | ||||
| 	echo "Invalid service specified: $SERVICE_TO_START" | ts | ||||
| @ -23,7 +24,7 @@ echo "Updating $CONFIG_JSON" | ||||
| for setting in $(compgen -A variable KCCONF_MEET); do | ||||
| 	setting2=${setting#KCCONF_MEET_} | ||||
| 	# dots in setting2 need to be escaped to not be handled as separate entities in the json file | ||||
| 	jq ".\"${setting2//_/\".\"}\" = \"${!setting}\"" $CONFIG_JSON | sponge $CONFIG_JSON | ||||
| 	jq ".\"${setting2//_/\".\"}\" = ${!setting}" $CONFIG_JSON | sponge $CONFIG_JSON | ||||
| done | ||||
| 
 | ||||
| # enable Kopano WebApp in the app switcher | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user