From 1fcf90f770301371113b2d275413170b9d9ab402 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Fri, 18 May 2018 03:57:00 +0200
Subject: [PATCH] Fix error if accepting default cert/key

---
 .gitignore         | 25 +++++++++++++++++++++++++
 install_mailman.sh | 10 ++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ec3107c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,25 @@
+
+# - common
+*.log
+*.swp
+conf/*.conf
+
+# - Postfixadmin
+postfixadmin-*
+
+# - AMaVis /vacation
+/dcc*
+*.log
+*.tar.Z
+crontab-root*
+
+# - Dovecot
+dovecot*
+log*
+
+# - roundcube
+/log/*
+roundcubemail-*
+
+# - mailman
+mailman*
diff --git a/install_mailman.sh b/install_mailman.sh
index 1b4f287..4b0a0aa 100755
--- a/install_mailman.sh
+++ b/install_mailman.sh
@@ -7,7 +7,7 @@ _MAILMAN_VERSION=2.1.26
 _MAILMAN_USER=mailman
 _MAILMAN_ADMIN_EMAIL="admin@initiativenserver.de"
 
-_MAILMAN_SRC_BASE_DIR=/usr/local/src/mailsystem
+_MAILMAN_SRC_BASE_DIR=/usr/local/src/mailman
 
 _WEBSERVER_USER=www-data
 _WEBSERVER_ADMIN_EMAIL="admin@initiativenserver.de"
@@ -427,10 +427,16 @@ if [ "$MAILMAN_DOMAINS" = "$_MAILMAN_DOMAINS" ]; then
       echo ""
       echononl "SSL Certificate location for \"$_domain\" [$_ssl_cert]: "
       read ssl_cert
+      if [ "X$ssl_cert" = "X" ]; then
+         ssl_cert=$_ssl_cert
+      fi
 
       echo ""
       echononl "SSL Key location for \"$_domain\" [$_ssl_key]: "
       read ssl_key
+      if [ "X$ssl_key" = "X" ]; then
+         ssl_key=$_ssl_key
+      fi
 
       WEBSERVER_DOMAINS="$WEBSERVER_DOMAINS ${_domain}|${ipv4}|${ipv6}|${vhost_dir}|${ssl_cert}|${ssl_key}"
 
@@ -1472,7 +1478,7 @@ if [ "$?" = "0" ]; then
    echo_ok
 else
    echo_failed
-   fatal "Das Restarten des Apache Webservers ist fehlgeschlagen"
+   error "Das Restarten des Apache Webservers ist fehlgeschlagen"
 fi