diff options
Diffstat (limited to 'openstack')
-rw-r--r-- | openstack/etc/horizon/apache-horizon.conf | 6 | ||||
-rw-r--r-- | openstack/manifest | 1 | ||||
-rw-r--r-- | openstack/usr/share/openstack/openstack-horizon-setup | 27 |
3 files changed, 5 insertions, 29 deletions
diff --git a/openstack/etc/horizon/apache-horizon.conf b/openstack/etc/horizon/apache-horizon.conf index e51fbd17..1b0b3fe3 100644 --- a/openstack/etc/horizon/apache-horizon.conf +++ b/openstack/etc/horizon/apache-horizon.conf @@ -1,6 +1,6 @@ <VirtualHost *:80> - WSGIScriptAlias /horizon /var/lib/horizon/django.wsgi - WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=/var/lib/horizon display-name=horzion + WSGIScriptAlias /horizon /var/lib/horizon/openstack_dashboard/django.wsgi + WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=/var/lib/horizon display-name=horizon WSGIApplicationGroup %{GLOBAL} SetEnv APACHE_RUN_USER apache @@ -10,7 +10,7 @@ DocumentRoot /var/lib/horizon/.blackhole Alias /static /var/lib/horizon/openstack_dashboard/static - <Directory "/var/lib/horizon" > + <Directory /var/lib/horizon/openstack_dashboard > Options Indexes FollowSymLinks MultiViews AllowOverride None # Apache 2.4 uses mod_authz_host for access control now (instead of diff --git a/openstack/manifest b/openstack/manifest index b19142b5..8c7b9915 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -152,7 +152,6 @@ 0100644 0 0 /etc/systemd/system/apache-httpd.service 0040755 0 0 /etc/horizon 0040755 0 0 /etc/horizon/openstack_dashboard -0040755 0 0 /var/lib/horizon 0100644 0 0 /etc/systemd/system/openstack-horizon-setup.service 0100755 0 0 /usr/share/openstack/openstack-horizon-setup 0100644 0 0 /etc/horizon/apache-horizon.conf diff --git a/openstack/usr/share/openstack/openstack-horizon-setup b/openstack/usr/share/openstack/openstack-horizon-setup index c8b15125..af944477 100644 --- a/openstack/usr/share/openstack/openstack-horizon-setup +++ b/openstack/usr/share/openstack/openstack-horizon-setup @@ -22,39 +22,16 @@ if [ -f /var/openstack/horizon-setup ]; then fi # Create required system users and groups -mkdir -p /var/lib/horizon getent group horizon >/dev/null || groupadd -r --gid 167 horizon getent passwd neutron >/dev/null || \ useradd --uid 167 -r -g horizon -d /var/lib/horizon -s /sbin/nologin \ -c "Horizon user" horizon -# Work around to make django.wsgi working with horizon -# See: https://bugs.launchpad.net/osprofiler/+bug/1361235 -# and: https://git.openstack.org/cgit/openstack/tripleo-image-elements/commit/?id=41c9a1dfad23f8aee366afb6a0b20a6c57ec8f79 -sed -i "s|'../..'|os.path.realpath('../..')|" \ - /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi - -# And link this django.wsgi file to the horizon home directory -ln -sf /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi \ - /var/lib/horizon/django.wsgi - -# Link Openstack local_settings where openstack_dashboard is installed. -ln -sf /etc/horizon/openstack_dashboard/local_settings.py \ - /usr/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py - -# Create the static directory (STATIC_ROOT) used in local_settings.py to keep -# the static objects like css files. -mkdir -p /var/lib/horizon/openstack_dashboard/static - -# Create the horizon document root for apache configuration -mkdir -p /var/lib/horizon/.blackhole +chown -R horizon:horizon /var/lib/horizon # Link horizon configuration file for apache to the directory where our apache load # configurations files -ln -sf /etc/horizon/apache-horizon.conf \ - /etc/httpd/conf.d/apache-horizon.conf - -chown -R horizon:horizon /var/lib/horizon +ln -sf /etc/horizon/apache-horizon.conf /etc/httpd/conf.d/apache-horizon.conf install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/horizon-setup Horizon setup: success |