Author: zbyniu Date: Sat Apr 10 22:56:53 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- get service configs; cosmetics
---- Files affected:
packages/courier-imap:
courier-imap-pop3-ssl.init (1.3 -> 1.4) , courier-imap-pop3.init (1.17 ->
1.18) , courier-imap.init (1.23 -> 1.24) , courier-imap-ssl.init (1.4 -> 1.5)
---- Diffs:
================================================================
Index: packages/courier-imap/courier-imap-pop3-ssl.init
diff -u packages/courier-imap/courier-imap-pop3-ssl.init:1.3
packages/courier-imap/courier-imap-pop3-ssl.init:1.4
--- packages/courier-imap/courier-imap-pop3-ssl.init:1.3 Fri Jun 2
00:57:31 2006
+++ packages/courier-imap/courier-imap-pop3-ssl.init Sun Apr 11 00:56:46 2010
@@ -14,6 +14,9 @@
# Get network config
. /etc/sysconfig/network
+# Get service config
+[ -f /etc/sysconfig/courier-pop3-ssl ] && . /etc/sysconfig/courier-pop3-ssl
+
# Check that networking is up.
if is_yes "${NETWORKING}"; then
if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ];
then
@@ -41,7 +44,7 @@
else
msg_already_running pop3d-ssl
fi
-;;
+ ;;
stop)
if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
msg_stopping pop3d-ssl
@@ -51,17 +54,17 @@
else
msg_not_running pop3d-ssl
fi
-;;
+ ;;
restart|force-reload)
$0 stop
$0 start
exit $?
-;;
+ ;;
status)
status couriertcpd
exit $?
-;;
- *)
+ ;;
+*)
msg_usage "$0 {start|stop|restart|force-reload|status}"
exit 3
esac
================================================================
Index: packages/courier-imap/courier-imap-pop3.init
diff -u packages/courier-imap/courier-imap-pop3.init:1.17
packages/courier-imap/courier-imap-pop3.init:1.18
--- packages/courier-imap/courier-imap-pop3.init:1.17 Fri Jun 2 00:57:32 2006
+++ packages/courier-imap/courier-imap-pop3.init Sun Apr 11 00:56:47 2010
@@ -14,6 +14,9 @@
# Get network config
. /etc/sysconfig/network
+# Get service config
+[ -f /etc/sysconfig/courier-pop3 ] && . /etc/sysconfig/courier-pop3
+
# Check that networking is up.
if is_yes "${NETWORKING}"; then
if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ];
then
@@ -37,7 +40,7 @@
else
msg_already_running pop3d
fi
-;;
+ ;;
stop)
if [ -f /var/lock/subsys/courier-pop3 ]; then
msg_stopping pop3d
@@ -47,7 +50,7 @@
else
msg_not_running pop3d
fi
-;;
+ ;;
restart|force-reload)
$0 stop
$0 start
================================================================
Index: packages/courier-imap/courier-imap.init
diff -u packages/courier-imap/courier-imap.init:1.23
packages/courier-imap/courier-imap.init:1.24
--- packages/courier-imap/courier-imap.init:1.23 Fri Jun 2 00:57:32 2006
+++ packages/courier-imap/courier-imap.init Sun Apr 11 00:56:47 2010
@@ -40,7 +40,7 @@
else
msg_already_running "Courier IMAP"
fi
-;;
+ ;;
stop)
if [ -f /var/lock/subsys/courier-imap ]; then
msg_stopping "Courier IMAP"
================================================================
Index: packages/courier-imap/courier-imap-ssl.init
diff -u packages/courier-imap/courier-imap-ssl.init:1.4
packages/courier-imap/courier-imap-ssl.init:1.5
--- packages/courier-imap/courier-imap-ssl.init:1.4 Fri Jun 2 00:57:32 2006
+++ packages/courier-imap/courier-imap-ssl.init Sun Apr 11 00:56:47 2010
@@ -14,6 +14,9 @@
# Get network config
. /etc/sysconfig/network
+# Get service config
+[ -f /etc/sysconfig/courier-imap-ssl ] && . /etc/sysconfig/courier-imap-ssl
+
# Check that networking is up.
if is_yes "${NETWORKING}"; then
if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ];
then
@@ -41,7 +44,7 @@
else
msg_already_running imapd-ssl
fi
-;;
+ ;;
stop)
if [ -f /var/lock/subsys/courier-imap-ssl ]; then
msg_stopping "Courier IMAP SSL"
@@ -51,17 +54,17 @@
else
msg_not_running "Courier IMAP SSL"
fi
-;;
+ ;;
restart|force-reload)
$0 stop
$0 start
exit $?
-;;
+ ;;
status)
# FIXME: matches other services, like courier-imap
status couriertcpd
exit $?
-;;
+ ;;
*)
msg_usage "$0 {start|stop|restart|force-reload|status}"
exit 3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/courier-imap/courier-imap-pop3-ssl.init?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/courier-imap/courier-imap-pop3.init?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/courier-imap/courier-imap.init?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/courier-imap/courier-imap-ssl.init?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
