[openstack-keystone] actually include wsgi sample in RPM
Alan Pevec
apevec at fedoraproject.org
Fri Oct 4 11:12:30 UTC 2013
commit f3634202648257e32e79e108a4d7eedffccc1128
Author: Alan Pevec <apevec at redhat.com>
Date: Fri Oct 4 13:07:11 2013 +0200
actually include wsgi sample in RPM
Do not include precompiled sample wsgi script,
it is copied to /var/www/cgi-bin/keystone/ manually
or by the Puppet Keystone module.
rhbz#991226
openstack-keystone.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 5711bba..614f49f 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -136,8 +136,8 @@ install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.servi
install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/keystone/sample_data.sh
install -p -D -m 755 %{SOURCE5} %{buildroot}%{_bindir}/openstack-keystone-sample-data
# Install sample HTTPD integration files
-install -p -D -m 644 httpd/*py %{buildroot}%{_datadir}/keystone/
-install -p -D -m 644 httpd/*conf %{buildroot}%{_datadir}/keystone/
+install -p -D -m 644 httpd/keystone.py %{buildroot}%{_datadir}/keystone/
+install -p -D -m 644 httpd/wsgi-keystone.conf %{buildroot}%{_datadir}/keystone/
install -d -m 755 %{buildroot}%{_sharedstatedir}/keystone
install -d -m 755 %{buildroot}%{_localstatedir}/log/keystone
@@ -197,6 +197,11 @@ fi
%attr(0644, root, keystone) %{_datadir}/keystone/keystone-dist.conf
%attr(0644, root, keystone) %{_datadir}/keystone/keystone-dist-paste.ini
%attr(0755, root, root) %{_datadir}/keystone/sample_data.sh
+%attr(0644, root, keystone) %{_datadir}/keystone/keystone.py
+# this is only a sample wsgi script, not final location so strip precompiled
+%exclude %{_datadir}/keystone/keystone.pyc
+%exclude %{_datadir}/keystone/keystone.pyo
+%attr(0644, root, keystone) %{_datadir}/keystone/wsgi-keystone.conf
%{_unitdir}/openstack-keystone.service
%dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
%config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/keystone.conf
More information about the scm-commits
mailing list