Continue working on getting horizon back in shape

conf/templates/horizon/horizon.conf

@@ -2,14 +2,17 @@
    This is a cheetah template!
 *#
 <VirtualHost *:$HORIZON_PORT>
-    WSGIScriptAlias / $HORIZON_DIR/openstack_dashboard/wsgi/django.wsgi
+    WSGIScriptAlias / ${HORIZON_DIR}/openstack_dashboard/wsgi/django.wsgi
     WSGIDaemonProcess horizon user=$USER group=$GROUP processes=3 threads=10 home=$HORIZON_DIR
+    WSGIApplicationGroup %{GLOBAL}
 
     SetEnv APACHE_RUN_USER $USER
     SetEnv APACHE_RUN_GROUP $GROUP
     WSGIProcessGroup horizon
 
-    DocumentRoot $HORIZON_DIR/.blackhole/
+#if $BLACK_HOLE_DIR
+    DocumentRoot $BLACK_HOLE_DIR
+#end if
     Alias /media $HORIZON_DIR/openstack_dashboard/static
 
     <Directory />
@@ -17,15 +20,15 @@
         AllowOverride None
     </Directory>
 
-    <Directory $HORIZON_DIR/>
+    <Directory ${HORIZON_DIR}>
         Options Indexes FollowSymLinks MultiViews
         AllowOverride None
         Order allow,deny
         allow from all
     </Directory>
 
-    ErrorLog /var/log/$APACHE_NAME/horizon_error.log
-    CustomLog /var/log/$APACHE_NAME/horizon_access.log combined
+    ErrorLog ${ERROR_LOG}
+    CustomLog ${ACCESS_LOG} combined
     LogLevel warn
 </VirtualHost>