- get service configs; cosmetics

Changed files:
    courier-imap-pop3-ssl.init -> 1.4
    courier-imap-pop3.init -> 1.18
    courier-imap-ssl.init -> 1.5
    courier-imap.init -> 1.24

diff --git a/courier-imap-pop3-ssl.init b/courier-imap-pop3-ssl.init
index 9300a5ff2464c5e586b4a5b03ab92d7e0d6e6289..1e651d62a6d316a9f97c7e9f2298dd36b4bedf6d 100644 (file)
--- a/courier-imap-pop3-ssl.init
+++ b/courier-imap-pop3-ssl.init
@@ -14,6 +14,9 @@ sbindir=@sbindir@
 # 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 @@ start)
        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 @@ stop)
        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

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 84596325ad52b16320dde3b81cbd1209463338d6..72f384a91eaefcf6cd2c31ef20e990736afeb7a3 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -14,6 +14,9 @@ sbindir=@sbindir@
 # 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 @@ start)
        else
                msg_already_running pop3d
        fi
-;;
+       ;;
 stop)
        if [ -f /var/lock/subsys/courier-pop3 ]; then
                msg_stopping pop3d
@@ -47,7 +50,7 @@ stop)
        else
                msg_not_running pop3d
        fi
-;;
+       ;;
 restart|force-reload)
        $0 stop
        $0 start

diff --git a/courier-imap-ssl.init b/courier-imap-ssl.init
index f9427c94008247dee651ccce8bae46a165813fcf..e05bcccdf88d97b0d8169541ab7de6343709c902 100644 (file)
--- a/courier-imap-ssl.init
+++ b/courier-imap-ssl.init
@@ -14,6 +14,9 @@ sbindir=@sbindir@
 # 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 @@ start)
        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 @@ stop)
        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

diff --git a/courier-imap.init b/courier-imap.init
index 2240ffb8fa2cff48e5cadaad1282db193eb5a730..470f5a48c52ebe4f3414c2d94f8f2934d93a69ca 100644 (file)
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -40,7 +40,7 @@ start)
        else
                msg_already_running "Courier IMAP"
        fi
-;;
+       ;;
 stop)
        if [ -f /var/lock/subsys/courier-imap ]; then
                msg_stopping "Courier IMAP"