summaryrefslogtreecommitdiff
path: root/openstack/etc/horizon/apache-horizon.conf
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-05-21 14:44:07 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-06-01 13:57:56 +0000
commit46858371af516134d63aee8198c2220fe6f58bc9 (patch)
tree282538dd74cb1ae3f3489f16f8d661a2a703f580 /openstack/etc/horizon/apache-horizon.conf
parent2363c5cdc7218f1192d379befdbdee2cfbc0fa08 (diff)
downloaddefinitions-46858371af516134d63aee8198c2220fe6f58bc9.tar.gz
Horizon: Install the openstack_dashboard django project in /var/lib/horizon
With this patch we avoid some problems: - Horizon trying to write in /usr/lib/python2.7/site-packages/static - We won't have to maintain a copy of local_settings.py - The workaround of creating a symlink for django.wsgi is not needed now. This patch also changes apache-horizon.conf to - Change the path of django.wsgi file - Load the horizon server with the url 'http://<IP-of-OpenStack>' (the 'horizon/' suffix is removed) - Grant permissions to access to /var/lib/horizon/static Also changes 'tempest.conf' to change Horizon urls.
Diffstat (limited to 'openstack/etc/horizon/apache-horizon.conf')
-rw-r--r--openstack/etc/horizon/apache-horizon.conf10
1 files changed, 6 insertions, 4 deletions
diff --git a/openstack/etc/horizon/apache-horizon.conf b/openstack/etc/horizon/apache-horizon.conf
index ea88897a..ab3cf0c7 100644
--- a/openstack/etc/horizon/apache-horizon.conf
+++ b/openstack/etc/horizon/apache-horizon.conf
@@ -1,16 +1,18 @@
<VirtualHost *:80>
- WSGIScriptAlias /horizon /var/lib/horizon/openstack_dashboard/django.wsgi
+ WSGIScriptAlias / /var/lib/horizon/openstack_dashboard/wsgi/django.wsgi
WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=/var/lib/horizon display-name=horizon
WSGIApplicationGroup %{GLOBAL}
- RedirectMatch ^/$ /horizon/
-
SetEnv APACHE_RUN_USER apache
SetEnv APACHE_RUN_GROUP apache
WSGIProcessGroup horizon
DocumentRoot /var/lib/horizon/.blackhole
- Alias /static /var/lib/horizon/openstack_dashboard/static
+ Alias /static /var/lib/horizon/static
+
+ <Directory /var/lib/horizon/static>
+ Require all granted
+ </Directory>
<Directory /var/lib/horizon/openstack_dashboard >
Options Indexes FollowSymLinks MultiViews