docker/scripts/run-lool.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit e050f925b1f5b6f71b7636b4e41d0d517ec2ec45 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Fri Nov 9 16:10:58 2018 +0100 Commit: Andras Timar <[email protected]> CommitDate: Fri Nov 9 21:03:25 2018 +0100 Docker: Fix replacement of username and password Change-Id: Ie757b1028712e7a6ceafdeeb50819afbc9829677 Reviewed-on: https://gerrit.libreoffice.org/63195 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh index 9c9cbb8cb..c85983b2b 100755 --- a/docker/scripts/run-lool.sh +++ b/docker/scripts/run-lool.sh @@ -30,8 +30,8 @@ fi # Replace trusted host perl -pi -e "s/localhost<\/host>/${domain}<\/host>/g" /etc/loolwsd/loolwsd.xml -perl -pi -e "s/<username desc=\"The username of the admin console. Must be set.\"><\/username>/<username desc=\"The username of the admin console. Must be set.\">${username}<\/username>/" /etc/loolwsd/loolwsd.xml -perl -pi -e "s/<password desc=\"The password of the admin console. Must be set.\"><\/password>/<password desc=\"The password of the admin console. Must be set.\">${password}<\/password>/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 # Start loolwsd su -c "/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd" -s /bin/bash lool _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
