Hello community,
here is the log from the commit of package openstack-dashboard for
openSUSE:Factory checked in at 2014-01-20 20:43:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-dashboard (Old)
and /work/SRC/openSUSE:Factory/.openstack-dashboard.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-dashboard"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-dashboard/openstack-dashboard.changes
2013-11-20 10:54:51.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.openstack-dashboard.new/openstack-dashboard.changes
2014-01-23 15:50:31.000000000 +0100
@@ -1,0 +2,117 @@
+Thu Jan 16 09:17:14 UTC 2014 - dmuel...@suse.com
+
+- add 0001-Bad-workflow-steps-check-has_required_fields.patch
+
+-------------------------------------------------------------------
+Mon Jan 6 16:05:43 UTC 2014 - vu...@suse.com
+
+- Make python-horizon require the 2013.2 version of
+ python-horizon-branding (and not the 2013.2.xyz version). This
+ makes it easier to create non-upstream branding; we already do
+ this for the other branding subpackage.
+
+-------------------------------------------------------------------
+Sun Dec 22 01:04:12 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.2.dev6.g2c1f1f3:
+ + Add check for BlockDeviceMappingV2 nova extension
+
+-------------------------------------------------------------------
+Wed Dec 18 10:32:58 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.2.dev5.g3e93b54:
+ + Gracefully handle Users with no email attribute
+
+-------------------------------------------------------------------
+Wed Dec 18 00:42:23 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.2.dev3.ge73ff07:
+ + Import install_venv from oslo
+
+-------------------------------------------------------------------
+Tue Dec 17 01:09:11 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.2.dev1.g29e4811:
+ + Bump stable/havana next version to 2013.2.2
+
+-------------------------------------------------------------------
+Mon Dec 16 09:31:36 UTC 2013 - dmuel...@suse.com
+
+- fix requires
+
+-------------------------------------------------------------------
+Sun Dec 15 01:19:09 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev41.g9668e80:
+ + Updated from global requirements
+
+-------------------------------------------------------------------
+Fri Dec 13 15:26:01 UTC 2013 - dmuel...@suse.com
+
+- put everything under /srv/www/openstack-dashboard
+
+-------------------------------------------------------------------
+Tue Dec 10 00:44:32 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev40.g852e5c8:
+ + Import translations for Havana 2013.2.1 udpate
+
+-------------------------------------------------------------------
+Sun Dec 8 01:00:07 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev37.g5d9684d:
+ + Deleting statistics tables from resource usage page
+ + Allow "Working" in spinner to be translatable
+ + lbaas/horizon - adds tcp protocol choice when create lb
+
+-------------------------------------------------------------------
+Sat Dec 7 01:09:13 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev31.g6d02f2e:
+ + Fix a bug some optional field in LBaaS are mandatory
+ + Fix bug so that escaped html is not shown in volume detach dialog
+ + Role name should not be translated in Domain Groups dialog
+ + Fix incomplete translation of "Update members" widget
+ + Fix translatable string for "Injected File Path Bytes"
+ + Add extra extension file to makemessage command line
+ + Add contextual markers to BatchAction messages
+
+-------------------------------------------------------------------
+Sat Nov 30 01:37:38 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev17.g7f804c9:
+ + Logging user out after self password change
+
+-------------------------------------------------------------------
+Fri Nov 29 01:19:15 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev15.g599d4a5:
+ + Add logging configuration for iso8601 module
+ + Ensure all compute meters are listed in dropdown
+ + Fix bug by escaping strings from Nova before displaying them
+
+-------------------------------------------------------------------
+Thu Nov 28 10:04:54 UTC 2013 - dmuel...@suse.com
+
+- add/use generic openstack-branding provides
+
+-------------------------------------------------------------------
+Thu Nov 28 00:47:55 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev9.g842ba5f:
+ + Fix default port of MS SQL in security group template
+
+-------------------------------------------------------------------
+Wed Nov 27 00:46:30 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev7.g9465e54:
+ + Provide missing hover hints for instance:<type> meters
+
+-------------------------------------------------------------------
+Tue Nov 26 01:04:59 UTC 2013 - opensuse-cl...@opensuse.org
+
+- Update to version 2013.2.1.dev5.g53047be:
+ + translate text: "subnet"/"subnet details"
+ + Change "Tenant" to "Project"
+
+-------------------------------------------------------------------
New:
----
0001-Bad-workflow-steps-check-has_required_fields.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-dashboard.spec ++++++
--- /var/tmp/diff_new_pack.snviiX/_old 2014-01-23 15:50:32.000000000 +0100
+++ /var/tmp/diff_new_pack.snviiX/_new 2014-01-23 15:50:32.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package openstack-dashboard
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define component horizon
Name: openstack-dashboard
-Version: 2013.2.1.dev2.gd97bba1
+Version: 2013.2.2.dev6.g2c1f1f3
Release: 0
Summary: OpenStack Dashboard (Horizon)
License: Apache-2.0
@@ -30,13 +30,14 @@
Source2: openstack-dashboard.conf.sample
# PATCH-FIX-SUSE: Use a saner default for static/media files
Patch0: suse-fix-webroot-paths.diff
+Patch1: 0001-Bad-workflow-steps-check-has_required_fields.patch
BuildRequires: apache2
BuildRequires: fdupes
BuildRequires: openstack-suse-macros
BuildRequires: python-devel
BuildRequires: python-pbr >= 0.5
BuildRequires: python-setuptools
-Requires: %{name}-branding = %{version}
+Requires: %{name}-branding = 2013.2
Requires: apache2
Requires: apache2-mod_wsgi
Requires: python >= 2.6.8
@@ -72,6 +73,7 @@
Summary: OpenStack Dashboard (Horizon) - Upstream Branding
Group: Development/Languages/Python
Provides: %{name}-branding = %{version}
+Provides: %{name}-branding = 2013.2
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
%if 0%{?suse_version} && 0%{?suse_version} > 1110
@@ -85,16 +87,16 @@
Summary: OpenStack Dashboard (Horizon) - Python Module
Group: Development/Languages/Python
Requires: python-ceilometerclient >= 1.0.5
-Requires: python-cinderclient >= 1.0.5
+Requires: python-cinderclient >= 1.0.6
Requires: python-django >= 1.4
Requires: python-django_compressor >= 1.3
-Requires: python-django_openstack_auth >= 1.1.1
+Requires: python-django_openstack_auth >= 1.1.3
Requires: python-eventlet >= 0.13.0
Requires: python-glanceclient >= 0.9.0
Requires: python-heatclient >= 0.2.3
Requires: python-heatclient >= 0.2.3
-Requires: python-horizon-branding = %{version}
-Requires: python-iso8601 >= 0.1.4
+Requires: python-horizon-branding = 2013.2
+Requires: python-iso8601 >= 0.1.8
Requires: python-keystoneclient >= 0.3.2
Requires: python-kombu >= 2.4.8
Requires: python-lesscpy >= 0.9j
@@ -104,7 +106,6 @@
Requires: python-novaclient >= 2.15.0
Requires: python-pbr >= 0.5.21
Requires: python-pytz >= 2010h
-Requires: python-six
Requires: python-swiftclient >= 1.5
%description -n python-horizon
@@ -115,6 +116,7 @@
Summary: OpenStack Dashboard (Horizon) - Python Module Upstream Branding
Group: Development/Languages/Python
Provides: python-horizon-branding = %{version}
+Provides: python-horizon-branding = 2013.2
Conflicts: otherproviders(python-horizon-branding)
Supplements: packageand(python-horizon:branding-upstream)
%if 0%{?suse_version} && 0%{?suse_version} > 1110
@@ -154,8 +156,9 @@
functionality of the OpenStack dashboard and its components.
%prep
-%setup -q -n horizon-2013.2.1.dev2.gd97bba1
+%setup -q -n horizon-2013.2.2.dev6.g2c1f1f3
%patch0
+%patch1 -p1
%openstack_cleanup_prep
%build
@@ -168,23 +171,22 @@
find %{buildroot}%{python_sitelib}/horizon/locale
%{buildroot}%{python_sitelib}/openstack_dashboard/locale -name "*.po" -delete
-print
# Move openstack_dashboard files
-install -d -m 755 %{buildroot}%{_datadir}/openstack-dashboard
-mv %{buildroot}%{python_sitelib}/openstack_dashboard/
%{buildroot}%{_datadir}/openstack-dashboard/
-cp -a manage.py %{buildroot}%{_datadir}/openstack-dashboard/
+install -d -m 755 %{buildroot}/srv/www/openstack-dashboard
+mv %{buildroot}%{python_sitelib}/openstack_dashboard/
%{buildroot}/srv/www/openstack-dashboard/
+cp -a manage.py %{buildroot}/srv/www/openstack-dashboard/
### Create a local_settings.py
-mv
%{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py{.example,}
+mv
%{buildroot}/srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py{.example,}
# create root for static files
-install -m 0755 -d
%{buildroot}/srv/www/openstack-dashboard/static/dashboard/css
-install -m 0755 -d %{buildroot}/srv/www/openstack-dashboard/static/dashboard/js
-install -m 0755 -d %{buildroot}/srv/www/openstack-dashboard/media
+install -m 0755 -d
%{buildroot}/srv/www/openstack-dashboard/openstack_dashboard/static/dashboard/css
+install -m 0755 -d
%{buildroot}/srv/www/openstack-dashboard/openstack_dashboard/static/dashboard/js
+install -m 0755 -d
%{buildroot}/srv/www/openstack-dashboard/openstack_dashboard/media
# Remove duplicate files
%if 0%{?suse_version}
%fdupes %{buildroot}%{python_sitelib}
-%fdupes %{buildroot}%{_datadir}/openstack-dashboard
-%fdupes %{buildroot}%{_datadir}/openstack-dashboard-test
+%fdupes %{buildroot}/srv/www/openstack-dashboard
%endif
# Apache2 SSL certificate stubs (generated in %%post):
@@ -201,65 +203,64 @@
%files
%defattr(-,root,root)
-%dir %{_datadir}/openstack-dashboard
-%{_datadir}/openstack-dashboard/manage.py
-%dir %{_datadir}/openstack-dashboard/openstack_dashboard
-%dir %attr(0750, wwwrun, www)
%{_datadir}/openstack-dashboard/openstack_dashboard/local
-%attr(0640, wwwrun, www)
%{_datadir}/openstack-dashboard/openstack_dashboard/local/__init__.py*
-%config(noreplace) %attr(0640, wwwrun, www)
%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
-%{_datadir}/openstack-dashboard/openstack_dashboard/api/
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/
-%{_datadir}/openstack-dashboard/openstack_dashboard/openstack/
-%{_datadir}/openstack-dashboard/openstack_dashboard/utils/
-%exclude
%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/*/*/templates
-%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/templates
-%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/test/
-%{_datadir}/openstack-dashboard/openstack_dashboard/usage/
-%{_datadir}/openstack-dashboard/openstack_dashboard/wsgi/
-%{_datadir}/openstack-dashboard/openstack_dashboard/conf/
-%{_datadir}/openstack-dashboard/openstack_dashboard/*.py*
%dir /srv/www/openstack-dashboard
-%dir /srv/www/openstack-dashboard/static
-%dir %attr(0770, root, www) /srv/www/openstack-dashboard/media
-%dir /srv/www/openstack-dashboard/static/dashboard
-%dir %attr(0770, root, www) /srv/www/openstack-dashboard/static/dashboard/css
-%dir %attr(0770, root, www) /srv/www/openstack-dashboard/static/dashboard/js
+/srv/www/openstack-dashboard/manage.py
+%dir /srv/www/openstack-dashboard/openstack_dashboard
+%dir %attr(0750, wwwrun, www)
/srv/www/openstack-dashboard/openstack_dashboard/local
+%attr(0640, wwwrun, www)
/srv/www/openstack-dashboard/openstack_dashboard/local/__init__.py*
+%config(noreplace) %attr(0640, wwwrun, www)
/srv/www/openstack-dashboard/openstack_dashboard/local/local_settings.py
+/srv/www/openstack-dashboard/openstack_dashboard/api/
+/srv/www/openstack-dashboard/openstack_dashboard/dashboards/
+/srv/www/openstack-dashboard/openstack_dashboard/openstack/
+/srv/www/openstack-dashboard/openstack_dashboard/utils/
+%exclude /srv/www/openstack-dashboard/openstack_dashboard/templates
+%exclude /srv/www/openstack-dashboard/openstack_dashboard/test/
+/srv/www/openstack-dashboard/openstack_dashboard/usage/
+/srv/www/openstack-dashboard/openstack_dashboard/wsgi/
+/srv/www/openstack-dashboard/openstack_dashboard/conf/
+/srv/www/openstack-dashboard/openstack_dashboard/*.py*
+%dir %attr(0770, root, www)
/srv/www/openstack-dashboard/openstack_dashboard/media
+%dir %attr(0770, root, www)
/srv/www/openstack-dashboard/openstack_dashboard/static/dashboard/css
+%dir /srv/www/openstack-dashboard/openstack_dashboard/static
+/srv/www/openstack-dashboard/openstack_dashboard/static/bootstrap
+%dir %attr(0770, root, www)
/srv/www/openstack-dashboard/openstack_dashboard/static/dashboard/js
%openstack_apache_ssl_cert_files
%{_sysconfdir}/apache2/conf.d/openstack-dashboard.conf.sample
# lang files
-%dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale
-%dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/*
-%dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/*/LC_MESSAGES
-#%lang(bg-bg)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/bg_BG/LC_MESSAGES/django.mo
-#%lang(ca)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/ca/LC_MESSAGES/django.mo
-#%lang(cs)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/cs/LC_MESSAGES/django.mo
-#%lang(en)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/en/LC_MESSAGES/django.mo
-%lang(en-au)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/en_AU/LC_MESSAGES/django.mo
-%lang(en-gb)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/en_GB/LC_MESSAGES/django.mo
-%lang(es)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/es/LC_MESSAGES/django.mo
-#%lang(fi-fi)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/fi_FI/LC_MESSAGES/django.mo
-%lang(fr)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/fr/LC_MESSAGES/django.mo
-#%lang(hu)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/hu/LC_MESSAGES/django.mo
-#%lang(it)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/it/LC_MESSAGES/django.mo
-%lang(ja)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/ja/LC_MESSAGES/django.mo
-#%lang(ka-ge)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/ka_GE/LC_MESSAGES/django.mo
-%lang(ko)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/ko_KR/LC_MESSAGES/django.mo
-%lang(nl-nl)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/nl_NL/LC_MESSAGES/django.mo
-#%lang(pl)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/pl/LC_MESSAGES/django.mo
-%lang(pl-pl)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/pl_PL/LC_MESSAGES/django.mo
-#%lang(pt)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/pt/LC_MESSAGES/django.mo
-%lang(ru)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/ru/LC_MESSAGES/django.mo
-%lang(pt-br)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/pt_BR/LC_MESSAGES/django.mo
-%lang(zh-cn)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.mo
-%lang(zh-tw)
%{_datadir}/openstack-dashboard/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.mo
+%dir /srv/www/openstack-dashboard/openstack_dashboard/locale
+%dir /srv/www/openstack-dashboard/openstack_dashboard/locale/*
+%dir /srv/www/openstack-dashboard/openstack_dashboard/locale/*/LC_MESSAGES
+#%lang(bg-bg)
/srv/www/openstack-dashboard/openstack_dashboard/locale/bg_BG/LC_MESSAGES/django.mo
+#%lang(ca)
/srv/www/openstack-dashboard/openstack_dashboard/locale/ca/LC_MESSAGES/django.mo
+#%lang(cs)
/srv/www/openstack-dashboard/openstack_dashboard/locale/cs/LC_MESSAGES/django.mo
+#%lang(en)
/srv/www/openstack-dashboard/openstack_dashboard/locale/en/LC_MESSAGES/django.mo
+%lang(en-au)
/srv/www/openstack-dashboard/openstack_dashboard/locale/en_AU/LC_MESSAGES/django.mo
+%lang(en-gb)
/srv/www/openstack-dashboard/openstack_dashboard/locale/en_GB/LC_MESSAGES/django.mo
+%lang(es)
/srv/www/openstack-dashboard/openstack_dashboard/locale/es/LC_MESSAGES/django.mo
+#%lang(fi-fi)
/srv/www/openstack-dashboard/openstack_dashboard/locale/fi_FI/LC_MESSAGES/django.mo
+%lang(fr)
/srv/www/openstack-dashboard/openstack_dashboard/locale/fr/LC_MESSAGES/django.mo
+#%lang(hu)
/srv/www/openstack-dashboard/openstack_dashboard/locale/hu/LC_MESSAGES/django.mo
+#%lang(it)
/srv/www/openstack-dashboard/openstack_dashboard/locale/it/LC_MESSAGES/django.mo
+%lang(ja)
/srv/www/openstack-dashboard/openstack_dashboard/locale/ja/LC_MESSAGES/django.mo
+#%lang(ka-ge)
/srv/www/openstack-dashboard/openstack_dashboard/locale/ka_GE/LC_MESSAGES/django.mo
+%lang(ko)
/srv/www/openstack-dashboard/openstack_dashboard/locale/ko_KR/LC_MESSAGES/django.mo
+%lang(nl-nl)
/srv/www/openstack-dashboard/openstack_dashboard/locale/nl_NL/LC_MESSAGES/django.mo
+#%lang(pl)
/srv/www/openstack-dashboard/openstack_dashboard/locale/pl/LC_MESSAGES/django.mo
+%lang(pl-pl)
/srv/www/openstack-dashboard/openstack_dashboard/locale/pl_PL/LC_MESSAGES/django.mo
+#%lang(pt)
/srv/www/openstack-dashboard/openstack_dashboard/locale/pt/LC_MESSAGES/django.mo
+%lang(ru)
/srv/www/openstack-dashboard/openstack_dashboard/locale/ru/LC_MESSAGES/django.mo
+%lang(pt-br)
/srv/www/openstack-dashboard/openstack_dashboard/locale/pt_BR/LC_MESSAGES/django.mo
+%lang(zh-cn)
/srv/www/openstack-dashboard/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.mo
+%lang(zh-tw)
/srv/www/openstack-dashboard/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.mo
%files branding-upstream
%defattr(-,root,root)
-%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/*/*/templates
-%{_datadir}/openstack-dashboard/openstack_dashboard/static
-%{_datadir}/openstack-dashboard/openstack_dashboard/templates
+/srv/www/openstack-dashboard/openstack_dashboard/static/dashboard
+%exclude /srv/www/openstack-dashboard/openstack_dashboard/static/dashboard/js
+%exclude /srv/www/openstack-dashboard/openstack_dashboard/static/dashboard/css
+/srv/www/openstack-dashboard/openstack_dashboard/templates
%files -n python-horizon
%defattr(-,root,root)
++++++ 0001-Bad-workflow-steps-check-has_required_fields.patch ++++++
>From 5a6efd12a676a42c769b8b2a158179e365867bc7 Mon Sep 17 00:00:00 2001
From: Matthew Wood <woodm1...@gmail.com>
Date: Wed, 11 Dec 2013 11:30:28 -0700
Subject: [PATCH] Bad workflow-steps check: has_required_fields
Many of the tabs on the Instance Creation screen don't show a "*"
despite having require fields. This is due to faulty logic in determining
whether the workflow-step has require fields. (Previously, only keys from
the contributes list were checked.)
Closes-Bug: 1252005
Change-Id: Id609da27c51f8d4725683d7fd1534ead0c3bb984
---
horizon/workflows/base.py | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/horizon/workflows/base.py b/horizon/workflows/base.py
index 0c8c200..1e5968a 100644
--- a/horizon/workflows/base.py
+++ b/horizon/workflows/base.py
@@ -447,14 +447,8 @@ class Step(object):
self.action.add_error(message)
def has_required_fields(self):
- """
- Returns True if action contains any required fields
- """
- for key in self.contributes:
- field = self.action.fields.get(key, None)
- if (field and field.required):
- return True
- return False
+ """Returns True if action contains any required fields."""
+ return any(field.required for field in self.action.fields.values())
class WorkflowMetaclass(type):
--
1.8.4.1
++++++ horizon-stable-havana.tar.gz ++++++
++++ 24931 lines of diff (skipped)
++++++ openstack-dashboard.conf.sample ++++++
--- /var/tmp/diff_new_pack.snviiX/_old 2014-01-23 15:50:33.000000000 +0100
+++ /var/tmp/diff_new_pack.snviiX/_new 2014-01-23 15:50:33.000000000 +0100
@@ -13,22 +13,24 @@
ErrorLog /var/log/apache2/openstack-dashboard-error_log
TransferLog /var/log/apache2/openstack-dashboard-access_log
- DocumentRoot /usr/share/openstack-dashboard/
-
- <Directory /usr/share/openstack-dashboard/static/>
- SetOutputFilter DEFLATE
- ExpiresActive On
- ExpiresDefault A604800
- </Directory>
-
- WSGIScriptAlias /
/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
+ WSGIScriptAlias /
/srv/www/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
WSGIDaemonProcess horizon user=wwwrun group=www processes=3 threads=10
SetEnv APACHE_RUN_USER wwwrun
SetEnv APACHE_RUN_GROUP www
- <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
+ DocumentRoot /srv/www/openstack-dashboard/
+
+ <Location /static>
+ SetOutputFilter DEFLATE
+ ExpiresActive On
+ ExpiresDefault "access plus 1 month"
+ </Location>
+
+ <Directory /srv/www/openstack-dashboard/>
+ Options FollowSymLinks MultiViews
+ AllowOverride None
Order allow,deny
- Allow from all
+ allow from all
</Directory>
</VirtualHost>
@@ -53,12 +55,24 @@
SSLCertificateFile /etc/apache2/ssl.crt/openstack-dashboard-server.crt
SSLCertificateKeyFile /etc/apache2/ssl.key/openstack-dashboard-server.key
- DocumentRoot /usr/share/openstack-dashboard/
+ DocumentRoot /srv/www/openstack-dashboard/
+
+ <Location /static>
+ ExpiresActive on
+ ExpiresDefault "access plus 1 month"
+ </Location>
+
+ <Location /static>
+ SetOutputFilter DEFLATE
+ ExpiresActive On
+ ExpiresDefault "access plus 1 month"
+ </Location>
- WSGIScriptAlias /
/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
- <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
+ <Directory /srv/www/openstack-dashboard/>
+ Options FollowSymLinks MultiViews
+ AllowOverride None
Order allow,deny
- Allow from all
+ allow from all
</Directory>
</VirtualHost>
++++++ suse-fix-webroot-paths.diff ++++++
--- /var/tmp/diff_new_pack.snviiX/_old 2014-01-23 15:50:33.000000000 +0100
+++ /var/tmp/diff_new_pack.snviiX/_new 2014-01-23 15:50:33.000000000 +0100
@@ -1,4 +1,4 @@
-Putting volatile files under /usr is a nogo.
+Just put all in one below openstack_dashboard, really
Index: openstack_dashboard/settings.py
===================================================================
@@ -9,10 +9,10 @@
LOGIN_REDIRECT_URL = '/'
-MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
-+MEDIA_ROOT = os.path.abspath(os.path.join('/srv/www/openstack-dashboard/',
'media'))
++MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, 'media'))
MEDIA_URL = '/media/'
-STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static'))
-+STATIC_ROOT = os.path.abspath(os.path.join('/srv/www/openstack-dashboard/',
'static'))
++STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, 'static'))
STATIC_URL = '/static/'
ROOT_URLCONF = 'openstack_dashboard.urls'
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
