[nextcloud-web] code: Fix line endings



commit ecf8eaa6d2b443e2edde23675b7057e03e2649ab
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue Dec 29 18:57:39 2020 +0100

    code: Fix line endings

 code/entrypoint.sh | 94 +++++++++++++++++++++++++++---------------------------
 1 file changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/code/entrypoint.sh b/code/entrypoint.sh
index 89da1c3..5d7e807 100755
--- a/code/entrypoint.sh
+++ b/code/entrypoint.sh
@@ -1,47 +1,47 @@
-#!/bin/sh
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# 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
-mkdir -p /opt/ssl/
-cd /opt/ssl/
-mkdir -p certs/ca
-openssl rand -writerand /opt/lool/.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
-if test "${cert_domain-set}" == set; then
-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"
-else
-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=${cert_domain}"
-fi
-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
-mv certs/servers/localhost/cert.pem /etc/loolwsd/cert.pem
-mv certs/ca/root.crt.pem /etc/loolwsd/ca-chain.cert.pem
-fi
-
-# Disable warning/info messages of LOKit by default
-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
-
-# Generate WOPI proof key
-loolwsd-generate-proof-key
-
-# Start loolwsd
-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 
--o:user_interface.mode=notebookbar ${extra_params}
+#!/bin/sh
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# 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
+mkdir -p /opt/ssl/
+cd /opt/ssl/
+mkdir -p certs/ca
+openssl rand -writerand /opt/lool/.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
+if test "${cert_domain-set}" == set; then
+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"
+else
+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=${cert_domain}"
+fi
+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
+mv certs/servers/localhost/cert.pem /etc/loolwsd/cert.pem
+mv certs/ca/root.crt.pem /etc/loolwsd/ca-chain.cert.pem
+fi
+
+# Disable warning/info messages of LOKit by default
+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
+
+# Generate WOPI proof key
+loolwsd-generate-proof-key
+
+# Start loolwsd
+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 
--o:user_interface.mode=notebookbar ${extra_params}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]