[libreoffice-online] 02/06: Revert "disable SSL per default until it doesn't crash with libssl 1.1"

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice-online.

commit d74553567dac8bc731a7b72588407b4b18b0811a
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Nov 27 18:08:44 2017 +0000

    Revert "disable SSL per default until it doesn't crash with libssl 1.1"
    
    This reverts commit edb97c322bedf5d3033573117bd7b14beb6232a1.
---
 debian/patches/series                     |  1 -
 debian/patches/ssl-false-per-default.diff | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 13ee98e..e00aa8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@ etc-default.diff
 ssl-dir.diff
 logs.diff
 poco-1.8.diff
-ssl-false-per-default.diff
 fix-sigsegv-with-libssl1.1.diff
diff --git a/debian/patches/ssl-false-per-default.diff b/debian/patches/ssl-false-per-default.diff
deleted file mode 100644
index d5aaf8d..0000000
--- a/debian/patches/ssl-false-per-default.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-disable SSL per default until it doesn't crash with libssl 1.1
-
-diff --git a/loolwsd.xml.in b/loolwsd.xml.in
-index eed5128..8fae6fe 100644
---- a/loolwsd.xml.in
-+++ b/loolwsd.xml.in
-@@ -52,7 +52,7 @@
-     </trace>
- 
-     <ssl desc="SSL settings">
--        <enable type="bool" default="true">true</enable>
-+        <enable type="bool" default="true">false</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">@LOOLWSD_CONFIGDIR@/cert.pem</cert_file_path>
-         <key_file_path desc="Path to the key file" relative="false">@LOOLWSD_CONFIGDIR@/key.pem</key_file_path>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git