SOURCES (AC-branch): rpm.macros, rpm.macros - apache reload as we ...

[glen]

Author: glen                         Date: Thu Jun 30 21:50:38 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- apache reload as we only change configuration, no full restart needed for apache

---- Files affected:
SOURCES:
   rpm.macros (1.158.4.48 -> 1.158.4.49) 
SOURCES:
   rpm.macros (1.225 -> 1.226) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.48 SOURCES/rpm.macros:1.158.4.49
--- SOURCES/rpm.macros:1.158.4.48	Mon Jun 27 20:21:15 2005
+++ SOURCES/rpm.macros	Thu Jun 30 23:50:33 2005
@@ -685,10 +685,10 @@
 if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{__apache_confdir %{-v*}} ]; then\
 	ln -sf %{-c*}%{!-c:%{_sysconfdir}/apache-%{name}.conf} %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf\
 fi\
-# restart apache if the config symlink is there\
+# reload apache if the config symlink is there\
 if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then\
 	if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
-		/etc/rc.d/init.d/%{__apache_svcname %{-v*}} restart 1>&2\
+		/etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2\
 	fi\
 fi\
 %{nil}
@@ -708,7 +708,7 @@
 	if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then \
 		rm -f %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf \
 		if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then \
-			/etc/rc.d/init.d/%{__apache_svcname %{-v*}} restart 1>&2 \
+			/etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2 \
 		fi \
 	fi \
 fi \

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.225 SOURCES/rpm.macros:1.226
--- SOURCES/rpm.macros:1.225	Mon Jun 27 20:21:15 2005
+++ SOURCES/rpm.macros	Thu Jun 30 23:50:33 2005
@@ -686,10 +686,10 @@
 if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{__apache_confdir %{-v*}} ]; then\
 	ln -sf %{-c*}%{!-c:%{_sysconfdir}/apache-%{name}.conf} %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf\
 fi\
-# restart apache if the config symlink is there\
+# reload apache if the config symlink is there\
 if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then\
 	if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\
-		/etc/rc.d/init.d/%{__apache_svcname %{-v*}} restart 1>&2\
+		/etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2\
 	fi\
 fi\
 %{nil}
@@ -709,7 +709,7 @@
 	if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then \
 		rm -f %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf \
 		if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then \
-			/etc/rc.d/init.d/%{__apache_svcname %{-v*}} restart 1>&2 \
+			/etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2 \
 		fi \
 	fi \
 fi \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.48&r2=1.158.4.49&f=u
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.225&r2=1.226&f=u