From 566bf9545cc0d270df9cd8908c3ea0478c359452 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 14 Nov 2017 16:36:47 +0100 Subject: [PATCH] disable ssl in Nginx config and fix shell script syntax causing interactive passwords not to be used --- doc/rpm-build/debian.postinst | 2 +- doc/rpm-build/nginx.conf | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/rpm-build/debian.postinst b/doc/rpm-build/debian.postinst index 5250086a61..6e9f456bac 100644 --- a/doc/rpm-build/debian.postinst +++ b/doc/rpm-build/debian.postinst @@ -48,7 +48,7 @@ then fi else # for non-interactive install let post_install generate passwords - if [ "$DEBIAN_FRONTEND"="noninteractive" ] + if [ "$DEBIAN_FRONTEND" = "noninteractive" ] then /usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log else diff --git a/doc/rpm-build/nginx.conf b/doc/rpm-build/nginx.conf index ddedc840f0..702b85470d 100644 --- a/doc/rpm-build/nginx.conf +++ b/doc/rpm-build/nginx.conf @@ -3,9 +3,9 @@ server { listen 80 default_server; - # ssl config - listen 443 ssl http2 default_server; - include snippets/snakeoil.conf; + # ssl config (enable following line plus either include or ssl_certificate* line) + #listen 443 ssl http2 default_server; + #include snippets/snakeoil.conf; # requires ssl-certs package installed! # concatenate private key, certificate and intermediate certs to /etc/ssl/private/certificate.pem #ssl_certificate /etc/ssl/private/certificate.pem; #ssl_certificate_key /etc/ssl/private/certificate.pem;