install_roundcube.sh: fis error creating vhost configuration.

This commit is contained in:
Christoph 2019-11-13 23:03:38 +01:00
parent d734611fa6
commit 7775ae21c6

View File

@ -1244,7 +1244,7 @@ if $_create_vhost_config ; then
cat <<EOF > ${APACHE_VHOST_DIR}/${WEBSITE_NAME}.conf 2>> $log_file cat <<EOF > ${APACHE_VHOST_DIR}/${WEBSITE_NAME}.conf 2>> $log_file
# -- $WEBSITE_NAME -- # # -- $WEBSITE_NAME -- #
<VirtualHost ${_vhost_ip_string_80}:80> <VirtualHost ${_vhost_ip_string_80}>
ServerAdmin $WEBMASTER_EMAIL ServerAdmin $WEBMASTER_EMAIL
@ -1260,7 +1260,7 @@ if $_create_vhost_config ; then
</VirtualHost> </VirtualHost>
<VirtualHost ${_vhost_ip_string_443}:443> <VirtualHost ${_vhost_ip_string_443}>
ServerAdmin $WEBMASTER_EMAIL ServerAdmin $WEBMASTER_EMAIL
@ -1444,6 +1444,7 @@ EOF
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
_failed=true _failed=true
fi fi
fi
if $_failed ; then if $_failed ; then
echo_failed echo_failed
error "$(cat $log_file)" error "$(cat $log_file)"
@ -1497,6 +1498,7 @@ echononl "\tRestart Apache Webservice.."
if [[ -n "$APACHE_SERVICE_FILE" ]] || [[ -n "$APACHE_INIT_SCRIPT" ]] ; then if [[ -n "$APACHE_SERVICE_FILE" ]] || [[ -n "$APACHE_INIT_SCRIPT" ]] ; then
if [[ -n "$APACHE_SERVICE_FILE" ]] ; then if [[ -n "$APACHE_SERVICE_FILE" ]] ; then
systemctl restart $APACHE_SERVICE_FILE > $log_file 2>&1 systemctl restart $APACHE_SERVICE_FILE > $log_file 2>&1
echo "systemctl restart $APACHE_SERVICE_FILE > $log_file 2>&1"
else else
$APACHE_INIT_SCRIPT restart > $log_file 2>&1 $APACHE_INIT_SCRIPT restart > $log_file 2>&1
fi fi