SOURCES: apache.init, apache1.init, cups.init, dspam.init, exim.in...

glen glen at pld-linux.org
Tue May 30 13:40:45 CEST 2006


Author: glen                         Date: Tue May 30 11:40:45 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- unify msg_not_running usage

---- Files affected:
SOURCES:
   apache.init (1.53 -> 1.54) , apache1.init (1.22 -> 1.23) , cups.init (1.21 -> 1.22) , dspam.init (1.4 -> 1.5) , exim.init (1.19 -> 1.20) , fetchmail.init (1.14 -> 1.15) , freeradius.init (1.7 -> 1.8) , greylistd.init (1.5 -> 1.6) , haldaemon.init (1.7 -> 1.8) , jabber-muc.init (1.4 -> 1.5) , mDNSResponder.init (1.4 -> 1.5) , monit.init (1.9 -> 1.10) , nagios.init (1.15 -> 1.16) , named.init (1.27 -> 1.28) , opensshd.init (1.27 -> 1.28) , openvpn.init (1.20 -> 1.21) , pld-builder.init (1.4 -> 1.5) , postfix.init (1.19 -> 1.20) , smartmontools.init (1.5 -> 1.6) , smb.init (1.18 -> 1.19) , syslog-ng.init (1.14 -> 1.15) , tenshi.init (1.1 -> 1.2) , winbind.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.53 SOURCES/apache.init:1.54
--- SOURCES/apache.init:1.53	Tue Jan 10 20:36:08 2006
+++ SOURCES/apache.init	Tue May 30 13:40:40 2006
@@ -82,7 +82,7 @@
 			RETVAL=$?
 		fi
 	else
-		msg_not_running httpd.${HTTPD_MPM} >&2
+		msg_not_running httpd.${HTTPD_MPM}
 		RETVAL=7
 	fi
 	;;
@@ -97,7 +97,7 @@
 			RETVAL=$?
 		fi
 	else
-		msg_not_running httpd.${HTTPD_MPM} >&2
+		msg_not_running httpd.${HTTPD_MPM}
 		RETVAL=7
 	fi
 	;;

================================================================
Index: SOURCES/apache1.init
diff -u SOURCES/apache1.init:1.22 SOURCES/apache1.init:1.23
--- SOURCES/apache1.init:1.22	Thu Mar 16 15:25:42 2006
+++ SOURCES/apache1.init	Tue May 30 13:40:40 2006
@@ -108,7 +108,7 @@
 			echo "Configuration file syntax test failed."
 		fi
 	else
-		msg_not_running apache >&2
+		msg_not_running apache
 		RETVAL=7
 	fi
 	;;
@@ -125,7 +125,7 @@
 			echo >&2 "Configuration file syntax test failed."
 		fi
 	else
-		msg_not_running apache >&2
+		msg_not_running apache
 		RETVAL=7
 	fi
 	;;

================================================================
Index: SOURCES/cups.init
diff -u SOURCES/cups.init:1.21 SOURCES/cups.init:1.22
--- SOURCES/cups.init:1.21	Thu Dec  8 02:02:49 2005
+++ SOURCES/cups.init	Tue May 30 13:40:40 2006
@@ -63,7 +63,7 @@
 		killproc cupsd -HUP
 		RETVAL=$?
 	else
-		msg_not_running CUPS >&2
+		msg_not_running CUPS
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/dspam.init
diff -u SOURCES/dspam.init:1.4 SOURCES/dspam.init:1.5
--- SOURCES/dspam.init:1.4	Sun May  7 17:08:53 2006
+++ SOURCES/dspam.init	Tue May 30 13:40:40 2006
@@ -51,7 +51,7 @@
 		killproc dspam -HUP
 		RETVAL=$?
 	else
-		msg_not_running dspam >&2
+		msg_not_running dspam
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/exim.init
diff -u SOURCES/exim.init:1.19 SOURCES/exim.init:1.20
--- SOURCES/exim.init:1.19	Thu Dec  8 02:02:49 2005
+++ SOURCES/exim.init	Tue May 30 13:40:40 2006
@@ -80,7 +80,7 @@
 		killproc exim -HUP
 		RETVAL=$?
 	else
-		msg_not_running Exim >&2
+		msg_not_running Exim
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/fetchmail.init
diff -u SOURCES/fetchmail.init:1.14 SOURCES/fetchmail.init:1.15
--- SOURCES/fetchmail.init:1.14	Thu Dec  8 02:02:49 2005
+++ SOURCES/fetchmail.init	Tue May 30 13:40:40 2006
@@ -69,7 +69,7 @@
 		killproc fetchmail -HUP
 		RETVAL=$?
 	else
-		msg_not_running fetchmail >&2
+		msg_not_running fetchmail
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/freeradius.init
diff -u SOURCES/freeradius.init:1.7 SOURCES/freeradius.init:1.8
--- SOURCES/freeradius.init:1.7	Fri Oct 15 11:54:11 2004
+++ SOURCES/freeradius.init	Tue May 30 13:40:40 2006
@@ -63,7 +63,7 @@
 		killproc "$RADIUSD" -HUP
 		RETVAL=$?
 	else
-		msg_not_running RADIUS >&2
+		msg_not_running RADIUS
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/greylistd.init
diff -u SOURCES/greylistd.init:1.5 SOURCES/greylistd.init:1.6
--- SOURCES/greylistd.init:1.5	Tue May 30 13:37:43 2006
+++ SOURCES/greylistd.init	Tue May 30 13:40:40 2006
@@ -57,7 +57,7 @@
 		killproc greylistd -HUP
 		RETVAL=$?
 	else
-		msg_not_running greylistd >&2
+		msg_not_running greylistd
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/haldaemon.init
diff -u SOURCES/haldaemon.init:1.7 SOURCES/haldaemon.init:1.8
--- SOURCES/haldaemon.init:1.7	Wed May 24 19:33:32 2006
+++ SOURCES/haldaemon.init	Tue May 30 13:40:40 2006
@@ -60,7 +60,7 @@
 		killproc hald -HUP
 		RETVAL=$?
 	else
-		msg_not_running haldaemon >&2
+		msg_not_running haldaemon
 		RETVAL=7
 	fi
 	;;

================================================================
Index: SOURCES/jabber-muc.init
diff -u SOURCES/jabber-muc.init:1.4 SOURCES/jabber-muc.init:1.5
--- SOURCES/jabber-muc.init:1.4	Thu Dec  8 02:02:49 2005
+++ SOURCES/jabber-muc.init	Tue May 30 13:40:40 2006
@@ -59,7 +59,7 @@
 		killproc jabber-muc -HUP
 		RETVAL=$?
 	else
-		msg_not_running "Jabber multi-user conference" >&2
+		msg_not_running "Jabber multi-user conference"
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/mDNSResponder.init
diff -u SOURCES/mDNSResponder.init:1.4 SOURCES/mDNSResponder.init:1.5
--- SOURCES/mDNSResponder.init:1.4	Sat May 20 14:32:55 2006
+++ SOURCES/mDNSResponder.init	Tue May 30 13:40:40 2006
@@ -62,7 +62,7 @@
 		killproc mdnsd -HUP
 		RETVAL=$?
 	else
-		msg_not_running mDNSResponder >&2
+		msg_not_running mDNSResponder
 		RETVAL=7
 	fi
 	;;

================================================================
Index: SOURCES/monit.init
diff -u SOURCES/monit.init:1.9 SOURCES/monit.init:1.10
--- SOURCES/monit.init:1.9	Thu Jul 28 15:08:53 2005
+++ SOURCES/monit.init	Tue May 30 13:40:40 2006
@@ -52,7 +52,7 @@
 		daemon monit -c /etc/monitrc reload
 		RETVAL=$?
 	else
-		msg_not_running monit >&2
+		msg_not_running monit
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/nagios.init
diff -u SOURCES/nagios.init:1.15 SOURCES/nagios.init:1.16
--- SOURCES/nagios.init:1.15	Thu Jul 28 12:15:18 2005
+++ SOURCES/nagios.init	Tue May 30 13:40:40 2006
@@ -81,7 +81,7 @@
 		killproc nagios -HUP
 		RETVAL=$?
 	else
-		msg_not_running nagios >&2
+		msg_not_running nagios
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/named.init
diff -u SOURCES/named.init:1.27 SOURCES/named.init:1.28
--- SOURCES/named.init:1.27	Thu Dec  8 02:02:49 2005
+++ SOURCES/named.init	Tue May 30 13:40:40 2006
@@ -77,7 +77,7 @@
 			RETVAL=$?
 		fi
 	else
-		msg_not_running "Named" >&2
+		msg_not_running "Named"
 		exit 7
 	fi
 

================================================================
Index: SOURCES/opensshd.init
diff -u SOURCES/opensshd.init:1.27 SOURCES/opensshd.init:1.28
--- SOURCES/opensshd.init:1.27	Sun Oct  9 13:52:42 2005
+++ SOURCES/opensshd.init	Tue May 30 13:40:40 2006
@@ -114,7 +114,7 @@
 		killproc sshd -HUP
 		RETVAL=$?
 	else
-		msg_not_running OpenSSH >&2
+		msg_not_running OpenSSH
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/openvpn.init
diff -u SOURCES/openvpn.init:1.20 SOURCES/openvpn.init:1.21
--- SOURCES/openvpn.init:1.20	Sun Sep  4 20:10:09 2005
+++ SOURCES/openvpn.init	Tue May 30 13:40:40 2006
@@ -98,7 +98,7 @@
 			[ $? -ne 0 -a $RETVAL -eq 0 ] && RETVAL=7
 		done
 	else
-		msg_not_running OpenVPN >&2
+		msg_not_running OpenVPN
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/pld-builder.init
diff -u SOURCES/pld-builder.init:1.4 SOURCES/pld-builder.init:1.5
--- SOURCES/pld-builder.init:1.4	Sat Apr 29 21:49:11 2006
+++ SOURCES/pld-builder.init	Tue May 30 13:40:40 2006
@@ -57,7 +57,7 @@
 		pld_builder_reload
 		RETVAL=$?
 	else
-		msg_not_running pld-builder >&2
+		msg_not_running pld-builder
 		RETVAL=7
 	fi
 	;;

================================================================
Index: SOURCES/postfix.init
diff -u SOURCES/postfix.init:1.19 SOURCES/postfix.init:1.20
--- SOURCES/postfix.init:1.19	Sat Sep 27 00:37:42 2003
+++ SOURCES/postfix.init	Tue May 30 13:40:40 2006
@@ -80,7 +80,7 @@
 		[ $RETVAL -ne 0 ] && RETVAL=7
 		[ $RETVAL -eq 0 ] && ok || died
 	else
-		msg_not_running Postfix >&2
+		msg_not_running Postfix
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/smartmontools.init
diff -u SOURCES/smartmontools.init:1.5 SOURCES/smartmontools.init:1.6
--- SOURCES/smartmontools.init:1.5	Thu Dec  8 02:02:49 2005
+++ SOURCES/smartmontools.init	Tue May 30 13:40:40 2006
@@ -50,7 +50,7 @@
 		killproc smartd -HUP
 		RETVAL=$?
 	else
-		msg_not_running smartd >&2
+		msg_not_running smartd
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/smb.init
diff -u SOURCES/smb.init:1.18 SOURCES/smb.init:1.19
--- SOURCES/smb.init:1.18	Mon Feb 27 17:55:19 2006
+++ SOURCES/smb.init	Tue May 30 13:40:40 2006
@@ -84,7 +84,7 @@
 		killproc smbd -HUP
 		RETVAL=$?
 	else
-		msg_not_running smb >&2
+		msg_not_running smb
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/syslog-ng.init
diff -u SOURCES/syslog-ng.init:1.14 SOURCES/syslog-ng.init:1.15
--- SOURCES/syslog-ng.init:1.14	Thu May 11 23:43:55 2006
+++ SOURCES/syslog-ng.init	Tue May 30 13:40:40 2006
@@ -81,7 +81,7 @@
 			echo >&2 "Configuration file syntax test failed."
 		fi
 	else
-		msg_not_running syslog-ng >&2
+		msg_not_running syslog-ng
 		exit 7
 	fi
 	;;

================================================================
Index: SOURCES/tenshi.init
diff -u SOURCES/tenshi.init:1.1 SOURCES/tenshi.init:1.2
--- SOURCES/tenshi.init:1.1	Wed Dec  8 22:32:01 2004
+++ SOURCES/tenshi.init	Tue May 30 13:40:40 2006
@@ -50,7 +50,7 @@
 		kill -HUP `cat /var/run/tenshi.pid` &>/dev/null
 		RETVAL=$?
 	else
-		msg_not_running tenshi >&2
+		msg_not_running tenshi
 		RETVAL=7
 	fi
 	;;
@@ -60,7 +60,7 @@
 		kill -USR2 `cat /var/run/tenshi.pid` &>/dev/null
 		RETVAL=$?
 	else
-		msg_not_running tenshi >&2
+		msg_not_running tenshi
 		RETVAL=7
 	fi
 	;;

================================================================
Index: SOURCES/winbind.init
diff -u SOURCES/winbind.init:1.6 SOURCES/winbind.init:1.7
--- SOURCES/winbind.init:1.6	Thu May  6 17:36:11 2004
+++ SOURCES/winbind.init	Tue May 30 13:40:40 2006
@@ -76,7 +76,7 @@
 		killproc winbindd -HUP
 		RETVAL=$?
 	else
-		msg_not_running winbindd >&2
+		msg_not_running winbindd
 		exit 7
 	fi
 	;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache.init?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/SOURCES/apache1.init?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SOURCES/cups.init?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SOURCES/dspam.init?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/exim.init?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SOURCES/fetchmail.init?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SOURCES/freeradius.init?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/greylistd.init?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/haldaemon.init?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/jabber-muc.init?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/mDNSResponder.init?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/monit.init?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SOURCES/nagios.init?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SOURCES/named.init?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SOURCES/opensshd.init?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SOURCES/openvpn.init?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SOURCES/pld-builder.init?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/postfix.init?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SOURCES/smartmontools.init?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/smb.init?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SOURCES/syslog-ng.init?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SOURCES/tenshi.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/winbind.init?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list