@@ -123,10 +123,20 @@ function init_horizon {

     fi

     local horizon_conf=$(apache_site_config_for horizon)

+

+    # Configure apache to run horizon

+    sudo sh -c "sed -e \"

+        s,%USER%,$APACHE_USER,g;

+        s,%GROUP%,$APACHE_GROUP,g;

+        s,%HORIZON_DIR%,$HORIZON_DIR,g;

+        s,%APACHE_NAME%,$APACHE_NAME,g;

+        s,%DEST%,$DEST,g;

+        s,%HORIZON_REQUIRE%,$HORIZON_REQUIRE,g;

+    \" $FILES/apache-horizon.template >$horizon_conf"

+

     if is_ubuntu; then

         disable_apache_site 000-default

         sudo touch $horizon_conf

-        enable_apache_site horizon

     elif is_fedora; then

         sudo sed '/^Listen/s/^.*$/Listen 0.0.0.0:80/' -i /etc/httpd/conf/httpd.conf

     elif is_suse; then

@@ -134,20 +144,12 @@ function init_horizon {

     else

         exit_distro_not_supported "horizon apache configuration"

     fi

+    enable_apache_site horizon

     # Remove old log files that could mess with how devstack detects whether Horizon

     # has been successfully started (see start_horizon() and functions::screen_it())

     sudo rm -f /var/log/$APACHE_NAME/horizon_*

-    # Configure apache to run horizon

-    sudo sh -c "sed -e \"

-        s,%USER%,$APACHE_USER,g;

-        s,%GROUP%,$APACHE_GROUP,g;

-        s,%HORIZON_DIR%,$HORIZON_DIR,g;

-        s,%APACHE_NAME%,$APACHE_NAME,g;

-        s,%DEST%,$DEST,g;

-        s,%HORIZON_REQUIRE%,$HORIZON_REQUIRE,g;

-    \" $FILES/apache-horizon.template >$horizon_conf"

 }

 # install_horizon() - Collect source and prepare