]>
Commit | Line | Data |
---|---|---|
6ec524db | 1 | diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in |
6328c7a3 AA |
2 | --- old/courier/imapd.rc.in 2003-11-29 02:16:15.000000000 +0000 |
3 | +++ new/courier/imapd.rc.in 2004-05-24 21:23:33.000000000 +0000 | |
6ec524db AA |
4 | @@ -53,6 +53,7 @@ |
5 | ;; | |
6 | stop) | |
7 | @sbindir@/couriertcpd -pid=$PIDFILE -stop | |
8 | + rm -f $PIDFILE | |
9 | ;; | |
10 | restart) | |
11 | @sbindir@/couriertcpd -pid=$PIDFILE -restart | |
12 | diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in | |
6328c7a3 AA |
13 | --- old/courier/imapd-ssl.rc.in 2003-11-29 02:16:15.000000000 +0000 |
14 | +++ new/courier/imapd-ssl.rc.in 2004-05-24 21:25:19.000000000 +0000 | |
15 | @@ -54,6 +54,7 @@ | |
6ec524db AA |
16 | ;; |
17 | stop) | |
18 | @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop | |
19 | + rm -f $SSLPIDFILE | |
20 | ;; | |
21 | esac | |
22 | exit 0 | |
23 | diff -Nur old/courier/module.esmtp/esmtpd.in new/courier/module.esmtp/esmtpd.in | |
6328c7a3 AA |
24 | --- old/courier/module.esmtp/esmtpd.in 2004-05-11 00:48:14.000000000 +0000 |
25 | +++ new/courier/module.esmtp/esmtpd.in 2004-05-24 21:23:33.000000000 +0000 | |
6ec524db AA |
26 | @@ -38,6 +38,7 @@ |
27 | ;; | |
28 | stop) | |
29 | ${sbindir}/couriertcpd -pid=$PIDFILE -stop | |
30 | + rm -f $PIDFILE | |
31 | exit 0 | |
32 | ;; | |
33 | restart) | |
34 | diff -Nur old/courier/module.esmtp/esmtpd-ssl.in new/courier/module.esmtp/esmtpd-ssl.in | |
6328c7a3 AA |
35 | --- old/courier/module.esmtp/esmtpd-ssl.in 2004-05-11 00:48:14.000000000 +0000 |
36 | +++ new/courier/module.esmtp/esmtpd-ssl.in 2004-05-24 21:24:41.000000000 +0000 | |
37 | @@ -28,6 +28,7 @@ | |
6ec524db AA |
38 | ;; |
39 | stop) | |
40 | ${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop | |
41 | + rm -f $SSLPIDFILE | |
42 | exit 0 | |
43 | ;; | |
44 | restart) | |
45 | diff -Nur old/courier/pop3d.in new/courier/pop3d.in | |
6328c7a3 AA |
46 | --- old/courier/pop3d.in 2003-11-28 01:04:59.000000000 +0000 |
47 | +++ new/courier/pop3d.in 2004-05-24 21:23:33.000000000 +0000 | |
6ec524db AA |
48 | @@ -42,6 +42,7 @@ |
49 | ;; | |
50 | stop) | |
51 | ${sbindir}/couriertcpd -pid=$PIDFILE -stop | |
52 | + rm -f $PIDFILE | |
53 | exit 0 | |
54 | ;; | |
55 | restart) | |
56 | diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in | |
6328c7a3 AA |
57 | --- old/courier/pop3d-ssl.in 2003-11-29 01:37:34.000000000 +0000 |
58 | +++ new/courier/pop3d-ssl.in 2004-05-24 21:25:31.000000000 +0000 | |
59 | @@ -58,6 +58,7 @@ | |
6ec524db AA |
60 | ;; |
61 | stop) | |
62 | @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop | |
63 | + rm -f $SSLPIDFILE | |
64 | ;; | |
65 | restart) | |
66 | @sbindir@/couriertcpd -pid=$SSLPIDFILE -restart | |
67 | diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in | |
6328c7a3 AA |
68 | --- old/courier.sysvinit.in 2004-05-02 14:24:06.000000000 +0000 |
69 | +++ new/courier.sysvinit.in 2004-05-24 21:23:33.000000000 +0000 | |
6ec524db AA |
70 | @@ -8,6 +8,9 @@ |
71 | # | |
72 | # | |
73 | ||
74 | +# Source function library | |
75 | +. /etc/rc.d/init.d/functions | |
76 | + | |
77 | prefix="@prefix@" | |
78 | exec_prefix="@exec_prefix@" | |
79 | sysconfdir="@sysconfdir@" | |
80 | @@ -24,6 +27,11 @@ | |
81 | ||
82 | case "$1" in | |
83 | start) | |
84 | + if [ -e /var/lock/subsys/courier ]; then | |
85 | + msg_already_running Courier | |
86 | + exit 0 | |
87 | + fi | |
88 | + | |
89 | cd / | |
90 | # Start daemons. | |
91 | touch /var/lock/subsys/courier | |
6328c7a3 | 92 | @@ -196,6 +204,9 @@ |
6ec524db AA |
93 | echo "" |
94 | ;; | |
95 | stop) | |
96 | + if [ -e /var/lock/subsys/courier ]; then | |
97 | + | |
98 | + rm -f /var/lock/subsys/courier | |
99 | echo -n "Stopping Courier mail server:" | |
100 | ||
101 | if test -x ${sbindir}/imapd | |
6328c7a3 | 102 | @@ -254,6 +265,10 @@ |
6ec524db AA |
103 | fi |
104 | ${sbindir}/courierfilter stop | |
105 | echo " courierfilter" | |
106 | + | |
107 | + else | |
108 | + msg_not_running Courier | |
109 | + fi | |
110 | ;; | |
111 | restart) | |
112 | $0 stop |