[Libreoffice-commits] online.git: docker/scripts

2020-03-05 Thread Andras Timar (via logerrit) 
 docker/scripts/run-lool.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59993fb9d1bdc2d3b95091cd2af3801916f9d955
Author: Andras Timar 
AuthorDate: Thu Mar 5 15:42:49 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Mar 5 21:11:30 2020 +0100

docker: don't start another shell, let the loolwsd process have the PID 1

(Suggested by Ralf Becker)

https://github.com/CollaboraOnline/Docker/commit/e024a6c2a34958cbb6e2208652902070b35a9e62#r37648923

Change-Id: Ifa519739686facb41eb9e85b68ebe547e008db34
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90019
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index 7fca8a15d..1707dd124 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -42,4 +42,4 @@ perl -pi -e "s/.*<\/password>/${password}<\/password
 ) &
 
 # Start loolwsd
-/bin/bash -c "/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 ${extra_params}"
+exec /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 ${extra_params}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/scripts

2019-06-13 Thread Andras Timar (via logerrit) 
 docker/scripts/run-lool.sh |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c13fe19667b51176e831084d2135b9803493dcdd
Author: Andras Timar 
AuthorDate: Thu Jun 13 12:14:01 2019 +0200
Commit: Andras Timar 
CommitDate: Thu Jun 13 13:18:40 2019 +0200

docker: fix SSL cert generation with OpenSSL 1.1.1

Change-Id: I1534cd3d3da19ac17e65571e6e2f7e7b0a8e61ca
Reviewed-on: https://gerrit.libreoffice.org/73953
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index 662828ec7..bc0ef7d64 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -15,12 +15,13 @@ if test "${DONT_GEN_SSL_CERT-set}" == set; then
 mkdir -p /opt/ssl/
 cd /opt/ssl/
 mkdir -p certs/ca
+openssl rand -writerand /root/.rnd
 openssl genrsa -out certs/ca/root.key.pem 2048
 openssl req -x509 -new -nodes -key certs/ca/root.key.pem -days 9131 -out 
certs/ca/root.crt.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=Dummy 
Authority"
 mkdir -p certs/{servers,tmp}
-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"
+mkdir -p certs/servers/localhost
+openssl genrsa -out certs/servers/localhost/privkey.pem 2048
+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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/scripts

2018-12-06 Thread Libreoffice Gerrit user 
 docker/scripts/run-lool.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 30b8170fab303b98c905db2bec7f6967c2e74c77
Author: Andras Timar 
AuthorDate: Thu Dec 6 23:47:49 2018 +0100
Commit: Andras Timar 
CommitDate: Thu Dec 6 23:47:49 2018 +0100

docker: fix permission (owner) of /etc/loolwsd/key.pem

Change-Id: I9e0a9d8bc8c0fc0119e9c66389c1012023046c89

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index a283672b4..f9ec69338 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -23,6 +23,7 @@ openssl genrsa -out "certs/servers/localhost/privkey.pem" 
2048 -key "certs/serve
 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
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/scripts

2018-11-13 Thread Libreoffice Gerrit user 
 docker/scripts/run-lool.sh |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 7cbb2e5168a24c726d763d3c9fef60ecbff35dcb
Author: Andras Timar 
AuthorDate: Tue Nov 13 11:43:01 2018 +0100
Commit: Andras Timar 
CommitDate: Tue Nov 13 11:43:01 2018 +0100

Fix domain name resolution from jails

Change-Id: I0bfe31956a2298ca908093905d33c3c151c77f39

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index 71f14396a..a283672b4 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -7,9 +7,8 @@
 
 export LC_CTYPE=en_US.UTF-8
 
-# Fix lool resolv.conf problem (wizdude)
-rm /opt/lool/systemplate/etc/resolv.conf
-ln -s /etc/resolv.conf /opt/lool/systemplate/etc/resolv.conf
+# Fix domain name resolution from jails
+cp /etc/resolv.conf /etc/hosts /opt/lool/systemplate/etc/
 
 if test "${DONT_GEN_SSL_CERT-set}" == set; then
 # Generate new SSL certificate instead of using the default
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/scripts

2018-11-12 Thread Libreoffice Gerrit user 
 docker/scripts/run-lool.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c1639750d94db05f9ff3dfd8856f5a8f7c20bc3
Author: Andras Timar 
AuthorDate: Mon Nov 12 21:22:51 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Nov 12 21:22:51 2018 +0100

pass extra loolwsd command line parameter via environment variable

docker run  -e "extra_params=." .

For example it makes sense to start loolwsd without SSL, when you test
or develop. In this case the syntax is: -e 
"extra_params=--o:ssl.enable=false"

Change-Id: Iaa9eafc1e1d3f2d24009321760d1b7d6a9998450

diff --git a/docker/scripts/run-lool.sh b/docker/scripts/run-lool.sh
index c85983b2b..71f14396a 100755
--- a/docker/scripts/run-lool.sh
+++ b/docker/scripts/run-lool.sh
@@ -34,4 +34,4 @@ perl -pi -e "s/.*<\/username>/${username}<\/username
 perl -pi -e "s/.*<\/password>/${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
+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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: docker/scripts

2018-11-09 Thread Libreoffice Gerrit user 
 docker/scripts/run-lool.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e050f925b1f5b6f71b7636b4e41d0d517ec2ec45
Author: Samuel Mehrbrodt 
AuthorDate: Fri Nov 9 16:10:58 2018 +0100
Commit: Andras Timar 
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 
Tested-by: Andras Timar 

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>/${username}<\/username>/" /etc/loolwsd/loolwsd.xml
-perl -pi -e "s/<\/password>/${password}<\/password>/g" /etc/loolwsd/loolwsd.xml
+perl -pi -e "s/.*<\/username>/${username}<\/username>/" /etc/loolwsd/loolwsd.xml
+perl -pi -e "s/.*<\/password>/${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
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits