diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2021-08-09 15:10:39 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2021-08-10 20:40:22 +0100 |
| commit | 7b898407985a13f78ac8a3385ac7a8ad8184b5c6 (patch) | |
| tree | 166bdc4fa761acddca4fee0367ee7671eb93d233 /docker | |
| parent | Configuration - clarify various key settings. (diff) | |
| download | online-7b898407985a13f78ac8a3385ac7a8ad8184b5c6.tar.gz online-7b898407985a13f78ac8a3385ac7a8ad8184b5c6.zip | |
docker: only substitute variables when they are set.
Clobbering a copied-in config un-necessarily is impolite.
Change-Id: I9eec5711d12def987f2ae08f9e6bd77f1636780e
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/from-packages/scripts/start-collabora-online.sh | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/docker/from-packages/scripts/start-collabora-online.sh b/docker/from-packages/scripts/start-collabora-online.sh index 4bd3e5dd2d..2b0ec9060e 100644 --- a/docker/from-packages/scripts/start-collabora-online.sh +++ b/docker/from-packages/scripts/start-collabora-online.sh @@ -33,12 +33,22 @@ if test "${SAL_LOG-set}" == set; then SAL_LOG="-INFO-WARN" fi -# Replace trusted host and set admin username and password -perl -pi -e "s/localhost<\/host>/${domain}<\/host>/g" /etc/loolwsd/loolwsd.xml -perl -pi -e "s/<username (.*)>.*<\/username>/<username \1>${username}<\/username>/" /etc/loolwsd/loolwsd.xml -perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password>/" /etc/loolwsd/loolwsd.xml -perl -pi -e "s/<server_name (.*)>.*<\/server_name>/<server_name \1>${server_name}<\/server_name>/" /etc/loolwsd/loolwsd.xml -perl -pi -e "s/<allowed_languages (.*)>.*<\/allowed_languages>/<allowed_languages \1>${dictionaries:-de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru}<\/allowed_languages>/" /etc/loolwsd/loolwsd.xml +# Replace trusted host and set admin username and password - only if they are set +if test -n "${domain}"; then + perl -pi -e "s/localhost<\/host>/${domain}<\/host>/g" /etc/loolwsd/loolwsd.xml +fi +if test -n "${username}"; then + perl -pi -e "s/<username (.*)>.*<\/username>/<username \1>${username}<\/username>/" /etc/loolwsd/loolwsd.xml +fi +if test -n "${password}"; then + perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password>/" /etc/loolwsd/loolwsd.xml +fi +if test -n "${server_name}"; then + perl -pi -e "s/<server_name (.*)>.*<\/server_name>/<server_name \1>${server_name}<\/server_name>/" /etc/loolwsd/loolwsd.xml +fi +if test -n "${dictionaries}"; then + perl -pi -e "s/<allowed_languages (.*)>.*<\/allowed_languages>/<allowed_languages \1>${dictionaries:-de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru}<\/allowed_languages>/" /etc/loolwsd/loolwsd.xml +fi # Restart when /etc/loolwsd/loolwsd.xml changes [ -x /usr/bin/inotifywait -a /usr/bin/killall ] && ( |