You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2012/10/06 02:52:25 UTC
[1/2] git commit: Leave permission settings to the install bit
Updated Branches:
refs/heads/maven-to-rpm e6caf2073 -> 4b079cd3d
Leave permission settings to the install bit
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4b079cd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4b079cd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4b079cd3
Branch: refs/heads/maven-to-rpm
Commit: 4b079cd3dd1304272bbeb61b38c2a10c6715203c
Parents: c439bb8
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Sat Oct 6 02:50:53 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Sat Oct 6 02:50:53 2012 +0200
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4b079cd3/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 2f6b15d..b0f4046 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -173,6 +173,16 @@ install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}/etc/rc.d/in
install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}/etc/rc.d/init.d/%{name}-management
install -D packaging/centos63/cloud-management.sysconfig ${RPM_BUILD_ROOT}/etc/sysconfig/%{name}-management
+chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina
+chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost
+chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client
+chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir}/%{name}/mnt
+chmod 770 ${RPM_BUILD_ROOT}%{_sharedstatedir}/%{name}/management
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management
+chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
+chmod -R ugo+x ${RPM_BUILD_ROOT}/usr/share/%{name}/management/webapps/client/WEB-INF/classes/scripts
%clean
[ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -198,18 +208,6 @@ rm -rf %{_localstatedir}/cache/%{name}
# user harcoded here, also hardcoded on wscript
%post management-server
-# %dir %attr doesn't work for permissions
-chmod 770 %{_sysconfdir}/%{name}/management/Catalina
-chmod 770 %{_sysconfdir}/%{name}/management/Catalina/localhost
-chmod 770 %{_sysconfdir}/%{name}/management/Catalina/localhost/client
-chmod 770 %{_sharedstatedir}/%{name}/mnt
-chmod 770 %{_sharedstatedir}/%{name}/management
-chmod 770 %{_localstatedir}/cache/%{name}/management/work
-chmod 770 %{_localstatedir}/cache/%{name}/management/temp
-chmod 770 %{_localstatedir}/log/%{name}/management
-chmod 770 %{_localstatedir}/log/%{name}/agent
-chmod 755 %{_datadir}/%{name}/management/webapps/client/WEB-INF/classes/scripts/vm/systemvm/injectkeys.sh
-
if [ "$1" == "1" ] ; then
/sbin/chkconfig --add %{name}-management > /dev/null 2>&1 || true
/sbin/chkconfig --level 345 %{name}-management on > /dev/null 2>&1 || true
@@ -220,8 +218,9 @@ if [ ! -f %{_datadir}/%{name}/management/webapps/client/WEB-INF/classes/scripts/
echo %{_datadir}/%{name}/management/webapps/client/WEB-INF/classes/scripts/vm/hypervisor/xenserver/
fi
+#No default permission as the permission setup is complex
%files management-server
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc LICENSE
%doc NOTICE
%dir %attr(0770,root,%{name}) %{_sysconfdir}/%{name}/management/Catalina