Commit 147ded4f authored by helmo's avatar helmo

Support Apache 2.4, conf-enabled dir structure

parent e2026158
......@@ -54,7 +54,14 @@ case "$1" in
# make sure we have apache configs settled in, for remote headless aegir servers
touch $VARLIB/config/apache.conf
chown aegir:aegir "$VARLIB/config/apache.conf"
ln -sf $VARLIB/config/apache.conf /etc/apache2/conf.d/aegir.conf
if [ -d /etc/apache2/conf-enabled ]; then
# Apache 2.4
ln -sf $VARLIB/config/apache.conf /etc/apache2/conf-enabled/aegir.conf
else
# Apache 2.2
ln -sf $VARLIB/config/apache.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