SPECS: apache1.spec, apache.spec - unify monitrd filename, fix per...

[glen]

Author: glen                         Date: Thu Dec  1 12:59:22 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify monitrd filename, fix permission

---- Files affected:
SPECS:
   apache1.spec (1.122 -> 1.123) , apache.spec (1.418 -> 1.419) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.122 SPECS/apache1.spec:1.123
--- SPECS/apache1.spec:1.122	Tue Nov 29 01:29:06 2005
+++ SPECS/apache1.spec	Thu Dec  1 13:59:16 2005
@@ -32,7 +32,7 @@
 Summary(zh_CN):	Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ
 Name:		apache1
 Version:	1.3.34
-Release:	5.4
+Release:	5.9
 License:	Apache Group
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -1391,7 +1391,7 @@
 install %{SOURCE24}	$CFG/80_errordocs.conf
 install %{SOURCE17}	$CFG/80_mod_alias.conf
 
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/apache.monitrc
 
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
 
@@ -1513,7 +1513,8 @@
 	mv -f /etc/sysconfig/apache{1.rpmsave,}
 fi
 
-%triggerpostun -- %{name} < 1.3.34-3.3
+%triggerpostun -- %{name} < 1.3.34-5.9
+if ! grep -q 'Include webapps.d/' /etc/apache/apache.conf; then
 # make sure webapps.d is included
 cp -f /etc/apache/apache.conf{,.rpmsave}
 sed -i -e '
@@ -1523,6 +1524,13 @@
 		aInclude webapps.d/*.conf
 	}
 ' /etc/apache/apache.conf
+fi
+
+# rename monitrc to be service name like other files
+if [ -f /etc/monit/apache1.monitrc.rpmsave ]; then
+	mv -f /etc/monit/apache.monitrc{,.rpmnew}
+	mv -f /etc/monit/{apache1.monitrc.rpmsave,apache.monitrc}
+fi
 
 %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2
 sed -i -e '/^\(Add\|Load\)Module.*mod_auth_dbm\.\(so\|c\)/d' /etc/apache/apache.conf
@@ -1828,7 +1836,7 @@
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apache
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
 
 %dir %{_libexecdir}
 
@@ -2397,6 +2405,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2005/12/01 12:59:16  glen
+- unify monitrd filename, fix permission
+
 Revision 1.122  2005/11/29 00:29:06  glen
 - add lingerd to initscript; lib64 fixes
 

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.418 SPECS/apache.spec:1.419
--- SPECS/apache.spec:1.418	Mon Nov 21 21:20:01 2005
+++ SPECS/apache.spec	Thu Dec  1 13:59:16 2005
@@ -35,7 +35,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.0.55
-Release:	3
+Release:	3.2
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -930,7 +930,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit/httpd.monitrc
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
 
@@ -1040,7 +1040,8 @@
 	mv -f /etc/sysconfig/{apache.rpmsave,httpd}
 fi
 
-%triggerpostun -- %{name} < 2.0.55-2.3
+%triggerpostun -- %{name} < 2.0.55-3.1
+if ! grep -q 'Include webapps.d/' /etc/httpd/httpd.conf/10_httpd.conf; then
 # make sure webapps.d is included
 cp -f /etc/httpd/httpd.conf/10_httpd.conf{,.rpmsave}
 # this file is ugly, so just append new lines
@@ -1048,6 +1049,13 @@
 # Include webapps config
 Include webapps.d/*.conf
 EOF
+fi
+
+# rename monitrc to be service name like other files
+if [ -f /etc/monit/apache.monitrc.rpmsave ]; then
+	mv -f /etc/monit/httpd.monitrc{,.rpmnew}
+	mv -f /etc/monit/{apache.monitrc.rpmsave,httpd.monitrc}
+fi
 
 %posttrans
 # minimizing apache restarts logics. we restart webserver:
@@ -1244,7 +1252,7 @@
 %attr(640,root,root) %{_sysconfdir}/magic
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
 
 %attr(755,root,root) %{_libexecdir}/mod_access.so
 %attr(755,root,root) %{_libexecdir}/mod_alias.so
@@ -1667,6 +1675,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.419  2005/12/01 12:59:16  glen
+- unify monitrd filename, fix permission
+
 Revision 1.418  2005/11/21 20:20:01  glen
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.122&r2=1.123&f=u
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.418&r2=1.419&f=u