android/app/src/main/cpp/CMakeLists.txt.in | 2 +- debian/loolwsd.postinst.in | 4 ++-- debian/loolwsd.service | 2 +- docker/scripts/run-lool.sh | 22 +++++++++++----------- loolwsd.service | 2 +- loolwsd.spec.in | 18 +++++++++--------- loolwsd.xml.in | 6 +++--- tools/Config.cpp | 2 +- 8 files changed, 29 insertions(+), 29 deletions(-)
New commits: commit 92785742896f20374fc080922d603cd76d2157ca Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> AuthorDate: Wed May 22 09:46:55 2019 +0200 Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> CommitDate: Wed May 22 10:27:33 2019 +0200 Adapt paths to new package name After 1dbbc5acc7d51adc363c2b43a24afae4b17971a6 Change-Id: I64a12fb13bc8f9371821b2d5969941bfddc2514a Reviewed-on: https://gerrit.libreoffice.org/72728 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/android/app/src/main/cpp/CMakeLists.txt.in b/android/app/src/main/cpp/CMakeLists.txt.in index cb1f31c8d..5614062af 100644 --- a/android/app/src/main/cpp/CMakeLists.txt.in +++ b/android/app/src/main/cpp/CMakeLists.txt.in @@ -21,7 +21,7 @@ add_library(androidapp SHARED ../../../../../wsd/Storage.cpp ../../../../../wsd/TileCache.cpp) -target_compile_definitions(androidapp PRIVATE LOOLWSD_CONFIGDIR="/etc/loolwsd") # TODO somewhere in assets maybe? +target_compile_definitions(androidapp PRIVATE LOOLWSD_CONFIGDIR="/etc/libreoffice-online") # TODO somewhere in assets maybe? target_include_directories(androidapp PRIVATE . # path to androidapp.h diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in index 942cbc695..daef0188f 100755 --- a/debian/loolwsd.postinst.in +++ b/debian/loolwsd.postinst.in @@ -9,8 +9,8 @@ case "$1" in adduser --quiet --system --group --home /opt/lool lool mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd rm -rf /var/cache/loolwsd/* - chown lool: /etc/loolwsd/loolwsd.xml - chmod 640 /etc/loolwsd/loolwsd.xml + chown lool: /etc/libreoffice-online/loolwsd.xml + chmod 640 /etc/libreoffice-online/loolwsd.xml # We assume that the LibreOffice to be used is built TDF-style # and installs in @LO_PATH@, and that /opt/lool is diff --git a/debian/loolwsd.service b/debian/loolwsd.service index d43d59078..a2ae6e645 100644 --- a/debian/loolwsd.service +++ b/debian/loolwsd.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd -ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/libreoffice-online User=lool KillMode=control-group Restart=always diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh index 662828ec7..427d73ad8 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 diff --git a/loolwsd.service b/loolwsd.service index d43d59078..a2ae6e645 100644 --- a/loolwsd.service +++ b/loolwsd.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd -ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd +ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/libreoffice-online User=lool KillMode=control-group Restart=always diff --git a/loolwsd.spec.in b/loolwsd.spec.in index 790e12f67..960d1e518 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -99,13 +99,13 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd /usr/bin/loolforkit /usr/bin/loolconvert /usr/bin/loolconfig -/usr/share/loolwsd/discovery.xml -/usr/share/loolwsd/favicon.ico -/usr/share/loolwsd/loleaflet -/usr/share/doc/loolwsd/README -/usr/share/doc/loolwsd/README.vars -/usr/share/doc/loolwsd/protocol.txt -/usr/share/doc/loolwsd/reference.md +/usr/share/libreoffice-online/discovery.xml +/usr/share/libreoffice-online/favicon.ico +/usr/share/libreoffice-online/loleaflet +/usr/share/doc/libreoffice-online/README +/usr/share/doc/libreoffice-online/README.vars +/usr/share/doc/libreoffice-online/protocol.txt +/usr/share/doc/libreoffice-online/reference.md /usr/share/man/man1/loolwsd.1 /usr/share/man/man1/loolforkit.1 /usr/share/man/man1/loolconvert.1 @@ -122,8 +122,8 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd %config(noreplace) /etc/cron.d/loolwsd.cron %config(noreplace) /etc/pam.d/loolwsd -%config(noreplace) %attr(640, lool, root) /etc/loolwsd/loolwsd.xml -%config /etc/loolwsd/loolkitconfig.xcu +%config(noreplace) %attr(640, lool, root) /etc/libreoffice-online/loolwsd.xml +%config /etc/libreoffice-online/loolkitconfig.xcu %doc README diff --git a/loolwsd.xml.in b/loolwsd.xml.in index 5ffb55ab7..100ca648a 100644 --- a/loolwsd.xml.in +++ b/loolwsd.xml.in @@ -85,9 +85,9 @@ <ssl desc="SSL settings"> <enable type="bool" desc="Controls whether SSL encryption is enable (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">@ENABLE_SSL@</enable> <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination> - <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path> - <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path> - <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path> + <cert_file_path desc="Path to the cert file" relative="false">/etc/libreoffice-online/cert.pem</cert_file_path> + <key_file_path desc="Path to the key file" relative="false">/etc/libreoffice-online/key.pem</key_file_path> + <ca_file_path desc="Path to the ca file" relative="false">/etc/libreoffice-online/ca-chain.cert.pem</ca_file_path> <cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"></cipher_list> <hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false"> <max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age> diff --git a/tools/Config.cpp b/tools/Config.cpp index 3bffb0ddc..d8564b893 100644 --- a/tools/Config.cpp +++ b/tools/Config.cpp @@ -280,7 +280,7 @@ int Config::main(const std::vector<std::string>& args) changed = true; #else - std::cerr << "This application was compiled with old OpenSSL. Operation not supported. You can use plain text password in /etc/loolwsd/loolwsd.xml." << std::endl; + std::cerr << "This application was compiled with old OpenSSL. Operation not supported. You can use plain text password in /etc/libreoffice-online/loolwsd.xml." << std::endl; return Application::EXIT_UNAVAILABLE; #endif } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits