rpms/zabbix/devel zabbix.spec,1.37,1.38

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/zabbix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25314

Modified Files:
	zabbix.spec 
Log Message:
Tighten configuration file permissions.


Index: zabbix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zabbix/devel/zabbix.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- zabbix.spec	9 Apr 2009 14:42:13 -0000	1.37
+++ zabbix.spec	16 Apr 2009 16:21:00 -0000	1.38
@@ -380,12 +380,24 @@
 
 %post server
 /sbin/chkconfig --add zabbix-server
+if [ $1 -gt 1 ]
+then
+  # Apply permissions also in *.rpmnew upgrades from old permissive ones
+  chmod 0640 %{_sysconfdir}/zabbix/zabbix_server.conf
+  chown root:zabbix %{_sysconfdir}/zabbix/zabbix_server.conf
+fi
 
 %post agent
 /sbin/chkconfig --add zabbix-agent
 
 %post proxy
 /sbin/chkconfig --add zabbix-proxy
+if [ $1 -gt 1 ]
+then
+  # Apply permissions also in *.rpmnew upgrades from old permissive ones
+  chmod 0640 %{_sysconfdir}/zabbix/zabbix_proxy.conf
+  chown root:zabbix %{_sysconfdir}/zabbix/zabbix_proxy.conf
+fi
 
 %preun server
 if [ "$1" = 0 ]
@@ -433,7 +445,7 @@
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
+%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
 %{_sysconfdir}/init.d/zabbix-server
 
@@ -465,7 +477,7 @@
 
 %files proxy
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
+%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
 %{_sysconfdir}/init.d/zabbix-proxy
 
@@ -483,7 +495,7 @@
 
 %files web
 %defattr(-,root,root,-)
-%dir %attr(0755,apache,apache) %{_sysconfdir}/zabbix/web
+%dir %attr(0750,apache,apache) %{_sysconfdir}/zabbix/web
 %ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/zabbix/web/zabbix.conf.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
 %{_datadir}/zabbix
@@ -499,6 +511,9 @@
 
 
 %changelog
+* Thu Apr  9 2009 Ville Skyttä <ville.skytta at iki.fi>
+- Tighten configuration file permissions.
+
 * Thu Apr  9 2009 Dan Horák <dan[at]danny.cz> - 1.6.4-2
 - make the -docs subpackage noarch