openstack/rpm-packaging
Code Issues Proposed changes

Use apache macros

Browse Source 
Where possible, use the newly create macros to handle apache differences.

Change-Id: I142533098b4e60e94c5778cb3fd53e689248dced
This commit is contained in:
Thomas Bechtold
2017-04-06 10:24:45 +02:00
parent f8ab84d8a7
commit 6d9b7320e5
3 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openstack/monasca-ui/monasca-ui.spec.j2
View File

@@ -6,14 +6,8 @@
%if 0%{?rhel} || 0%{?fedora}
%global rdo 1
%global http_confdir %{_sysconfdir}/httpd/conf.d
%global http_user apache
%global http_group apache
%global http_dashboard_dir %{_datarootdir}/openstack-dashboard
%else
%global http_confdir %{_sysconfdir}/apache2/conf.d
%global http_user wwwrun
%global http_group www
%global http_dashboard_dir /srv/www/openstack-dashboard
%endif
@@ -61,10 +55,10 @@ cp -a monitoring/enabled/_50_admin_add_monitoring_panel.py %{buildroot}%{http_da
%fdupes %{buildroot}%{http_dashboard_dir}
%post
su %{http_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collectstatic --noinput --clear > /dev/null"
su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collectstatic --noinput --clear > /dev/null"
%postun
su %{http_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collectstatic --noinput --clear > /dev/null"
su %{apache_user} -s /bin/sh -c "python %{http_dashboard_dir}/manage.py collectstatic --noinput --clear > /dev/null"
%files
%{http_dashboard_dir}/openstack_dashboard/enabled/_50_admin_add_monitoring_panel.py