Fix error if accepting default cert/key
This commit is contained in:
parent
d13396fb2d
commit
1fcf90f770
25
.gitignore
vendored
Normal file
25
.gitignore
vendored
Normal file
@ -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*
|
@ -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
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user