Commit 643cc6bb authored by anarcat's avatar anarcat

install apache config file in the proper location for either 2.2 or 2.4, fixes #2153929

Conflicts:
	debian/aegir2-provision.postinst
parent 4a4096fc
......@@ -134,7 +134,9 @@ EOF
case $WEBSERVER in
apache)
ln -sf $AEGIRHOME/config/$WEBSERVER.conf /etc/apache2/conf.d/aegir.conf
# apache 2.2 || 2.4
ln -sf $AEGIRHOME/config/$WEBSERVER.conf /etc/apache2/conf.d/aegir.conf \
|| ln -sf $VARLIB/config/$WEBSERVER.conf /etc/apache2/conf-enabled/aegir.conf
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