From c339b629fcdeabdf84213f384da7680a330c8824 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Thu, 9 Jul 2015 10:45:48 +0300 Subject: [PATCH] Update Horizon package Fix some issues with Horizon package Closes-Bug: #1470143 Change-Id: I6095cca7607328238b0f2d67f8c14acc5d933a0b --- .gitreview | 2 +- trusty/debian/openstack-dashboard.conf | 0 trusty/debian/openstack-dashboard.links | 7 +++---- trusty/debian/openstack-dashboard.postinst | 8 ++------ trusty/debian/rules | 9 ++++----- 5 files changed, 10 insertions(+), 16 deletions(-) mode change 100755 => 100644 trusty/debian/openstack-dashboard.conf diff --git a/.gitreview b/.gitreview index 4b68e84..85f9267 100644 --- a/.gitreview +++ b/.gitreview @@ -2,6 +2,6 @@ host=review.fuel-infra.org port=29418 project=openstack-build/horizon-build -defaultbranch=master +defaultbranch=openstack-ci/fuel-7.0/2015.1.0 diff --git a/trusty/debian/openstack-dashboard.conf b/trusty/debian/openstack-dashboard.conf old mode 100755 new mode 100644 diff --git a/trusty/debian/openstack-dashboard.links b/trusty/debian/openstack-dashboard.links index c5ba665..8cee2f4 100644 --- a/trusty/debian/openstack-dashboard.links +++ b/trusty/debian/openstack-dashboard.links @@ -1,6 +1,5 @@ -/usr/bin/lessc /usr/share/openstack-dashboard/bin/less/lessc -/usr/share/openstack-dashboard/openstack_dashboard/static /usr/share/openstack-dashboard/static -/var/lib/openstack-dashboard/static/scss /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss /var/lib/openstack-dashboard/static/css /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css +/var/lib/openstack-dashboard/static/css /usr/share/openstack-dashboard/static/dashboard/css /var/lib/openstack-dashboard/static/js /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js -/usr/share/fonts-font-awesome/fonts /usr/share/pyshared/horizon/static/horizon/lib/font-awesome/fonts +/var/lib/openstack-dashboard/static/js /usr/share/openstack-dashboard/static/dashboard/js +/usr/bin/lessc /usr/share/openstack-dashboard/bin/less/lessc diff --git a/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst index a7f4736..688c967 100644 --- a/trusty/debian/openstack-dashboard.postinst +++ b/trusty/debian/openstack-dashboard.postinst @@ -40,9 +40,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then mkdir -p /var/lib/openstack-dashboard/static/js mkdir -p /var/lib/openstack-dashboard/static/css mkdir -p /var/lib/openstack-dashboard/secret-key - chown horizon:horizon /var/lib/openstack-dashboard/static - chown horizon:horizon /var/lib/openstack-dashboard/static/css - chown horizon:horizon /var/lib/openstack-dashboard/static/js + chown -R horizon:horizon /var/lib/openstack-dashboard/static chown horizon:horizon /var/lib/openstack-dashboard/secret-key chown -R horizon /var/lib/openstack-dashboard/secret-key chmod 775 /var/lib/openstack-dashboard @@ -70,11 +68,9 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then fi if [ -f /etc/openstack-dashboard/secret_key ] && [ ! -f /var/lib/openstack-dashboard/secret_key ] ; then ln -s /etc/openstack-dashboard/secret_key /var/lib/openstack-dashboard/secret_key - chown horizon:horizon /var/lib/openstack-dashboard/secret_key + chown horizon:horizon /var/lib/openstack-dashboard/secret_key fi chown -R horizon:horizon /var/lib/openstack-dashboard - mkdir -p /usr/lib/python2.7/dist-packages/horizon/static/horizon/lib/font-awesome - ln -s /usr/share/fonts-font-awesome/font /usr/lib/python2.7/dist-packages/horizon/static/horizon/lib/font-awesome/fonts || true fi if [ "$1" = "triggered" ] ; then diff --git a/trusty/debian/rules b/trusty/debian/rules index c72ffd1..ff4becd 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -36,8 +36,6 @@ override_dh_auto_install: install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf-available cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/ - install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard - cp -a $(CURDIR)/openstack_dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/ cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \ $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py @@ -63,10 +61,11 @@ override_dh_auto_install: ln -fs /usr/lib/$(PYVER)/dist-packages/horizon/static/horizon \ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/horizon + # Link to awesome fonts + install -d -m 755 $(CURDIR)/debian/tmp/usr/lib/$(PYVER)/dist-packages/horizon/static/horizon/lib/font-awesome + ln -fs /usr/share/fonts-font-awesome/fonts $(CURDIR)/debian/tmp/usr/lib/$(PYVER)/dist-packages/horizon/static/horizon/lib/font-awesome/fonts + override_dh_link: - mkdir -p $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss - mv $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss/* $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss - rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css rm -rf $(CURDIR)/debian/openstack-dashboard/usr/share/pyshared/horizon/static/horizon/lib/font-awesome/fonts -- 2.45.2