commit cbd97ca975d1889d39f2ffd34b498080ef1ca3a9
author Christian Berendt <berendt@b1-systems.de> Thu Mar 27 12:48:43 2014 +0000
committer Christian Berendt <berendt@b1-systems.de> Thu Mar 27 14:30:12 2014 +0000
tree 3d9e353c2b00de95c6c3cf29f28ad2171de7eb35
parent 72eebd786551f8031c7129fb142c5a92c0bc63b5

use disable/enable_apache_site on Ubuntu

Using the specific Apache2 tools a2ensite and a2dissite
(used in the methods disable/enable_apache_site in lib/apache)
should be the preferred way to disable the default site and
to enable the horizon site.

fixes bug #1298031

Change-Id: I2f247c0b6e605a330086a558e03e2c36666c55be

lib/horizon

diff --git a/lib/horizon b/lib/horizon
index 27c2d26..90a2bc5 100644
--- a/lib/horizon
+++ b/lib/horizon
@@ -114,11 +114,9 @@
 
     local horizon_conf=/etc/$APACHE_NAME/$APACHE_CONF_DIR/horizon.conf
     if is_ubuntu; then
-        # Clean up the old config name
-        sudo rm -f /etc/apache2/sites-enabled/000-default
-        # Be a good citizen and use the distro tools here
+        disable_apache_site 000-default
         sudo touch $horizon_conf
-        sudo a2ensite horizon.conf
+        enable_apache_site horizon.conf
     elif is_fedora; then
         sudo sed '/^Listen/s/^.*$/Listen 0.0.0.0:80/' -i /etc/httpd/conf/httpd.conf
     elif is_suse; then