extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 13:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

disable ssl in Nginx config and fix shell script syntax causing interactive passwords not to be used

Browse Source
This commit is contained in:
Ralf Becker 2017-11-14 16:36:47 +01:00
parent 3d50fe76fb
commit 566bf9545c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/rpm-build/debian.postinst
View File

@ -48,7 +48,7 @@ then
fi fi
else else
# for non-interactive install let post_install generate passwords # for non-interactive install let post_install generate passwords
if [ "$DEBIAN_FRONTEND"="noninteractive" ] if [ "$DEBIAN_FRONTEND" = "noninteractive" ]
then then
/usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log /usr/share/egroupware/doc/rpm-build/post_install.php 2>&1 | /usr/bin/tee -a $install_log
else else

6
doc/rpm-build/nginx.conf
View File

@ -3,9 +3,9 @@
server { server {
listen 80 default_server; listen 80 default_server;
# ssl config # ssl config (enable following line plus either include or ssl_certificate* line)
listen 443 ssl http2 default_server; #listen 443 ssl http2 default_server;
include snippets/snakeoil.conf; #include snippets/snakeoil.conf; # requires ssl-certs package installed!
# concatenate private key, certificate and intermediate certs to /etc/ssl/private/certificate.pem # concatenate private key, certificate and intermediate certs to /etc/ssl/private/certificate.pem
#ssl_certificate /etc/ssl/private/certificate.pem; #ssl_certificate /etc/ssl/private/certificate.pem;
#ssl_certificate_key /etc/ssl/private/certificate.pem; #ssl_certificate_key /etc/ssl/private/certificate.pem;