diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-05-22 09:46:55 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-05-22 10:27:33 +0200 |
| commit | 92785742896f20374fc080922d603cd76d2157ca (patch) | |
| tree | 997eb9116db0d15b5a3d1d121dd1f6bc12f2e383 /docker | |
| parent | mobile: Avoid uncaught exceptions when some toolbars don't exist at all. (diff) | |
| download | online-92785742896f20374fc080922d603cd76d2157ca.tar.gz online-92785742896f20374fc080922d603cd76d2157ca.zip | |
Adapt paths to new package name
After 1dbbc5acc7d51adc363c2b43a24afae4b17971a6
Change-Id: I64a12fb13bc8f9371821b2d5969941bfddc2514a
Reviewed-on: https://gerrit.libreoffice.org/72728
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/scripts/run-lool.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh index 662828ec71..427d73ad82 100755 --- a/docker/scripts/run-lool.sh +++ b/docker/scripts/run-lool.sh @@ -22,24 +22,24 @@ mkdir -p "certs/servers/localhost" openssl genrsa -out "certs/servers/localhost/privkey.pem" 2048 -key "certs/servers/localhost/privkey.pem" openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out "certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost" openssl x509 -req -in certs/tmp/localhost.csr.pem -CA certs/ca/root.crt.pem -CAkey certs/ca/root.key.pem -CAcreateserial -out certs/servers/localhost/cert.pem -days 9131 -mv certs/servers/localhost/privkey.pem /etc/loolwsd/key.pem -chown lool: /etc/loolwsd/key.pem -mv certs/servers/localhost/cert.pem /etc/loolwsd/cert.pem -mv certs/ca/root.crt.pem /etc/loolwsd/ca-chain.cert.pem +mv certs/servers/localhost/privkey.pem /etc/libreoffice-online/key.pem +chown lool: /etc/libreoffice-online/key.pem +mv certs/servers/localhost/cert.pem /etc/libreoffice-online/cert.pem +mv certs/ca/root.crt.pem /etc/libreoffice-online/ca-chain.cert.pem fi # Replace trusted host -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/localhost<\/host>/${domain}<\/host>/g" /etc/libreoffice-online/loolwsd.xml +perl -pi -e "s/<username (.*)>.*<\/username>/<username \1>${username}<\/username>/" /etc/libreoffice-online/loolwsd.xml +perl -pi -e "s/<password (.*)>.*<\/password>/<password \1>${password}<\/password>/" /etc/libreoffice-online/loolwsd.xml -# Restart when /etc/loolwsd/loolwsd.xml changes +# Restart when /etc/libreoffice-online/loolwsd.xml changes [ -x /usr/bin/inotifywait -a /usr/bin/killall ] && ( - /usr/bin/inotifywait -e modify /etc/loolwsd/loolwsd.xml - echo "$(ls -l /etc/loolwsd/loolwsd.xml) modified --> restarting" + /usr/bin/inotifywait -e modify /etc/libreoffice-online/loolwsd.xml + echo "$(ls -l /etc/libreoffice-online/loolwsd.xml) modified --> restarting" /usr/bin/killall -1 loolwsd ) & # 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 ${extra_params}" -s /bin/bash lool +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/libreoffice-online ${extra_params}" -s /bin/bash lool |