Commit 7526aae2 authored by helmo's avatar helmo

Add explicit test to avoid needless error

The output would contain the error below, after which the second attempt (conf-enabled) would normally work OK.

ln: failed to create symbolic link '/etc/apache2/conf.d/aegir.conf': No such file or directory
parent 483a048a
......@@ -154,9 +154,13 @@ EOF
case $WEBSERVER in
apache)
# apache 2.2 || 2.4
ln -sf $AEGIRHOME/config/$WEBSERVER.conf /etc/apache2/conf.d/aegir.conf \
|| ln -sf $AEGIRHOME/config/$WEBSERVER.conf /etc/apache2/conf-enabled/aegir.conf
if [ -d /etc/apache2/conf-enabled ]; then
# Apache 2.4
ln -sf $AEGIRHOME/config/$WEBSERVER.conf /etc/apache2/conf-enabled/aegir.conf
else
# Apache 2.2
ln -sf $AEGIRHOME/config/$WEBSERVER.conf /etc/apache2/conf.d/aegir.conf
fi
a2enmod ssl rewrite
apache2ctl graceful
;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment