]>
Commit | Line | Data |
---|---|---|
d17b8ca4 | 1 | diff -urN courier-0.64.2.orig//courier/imapd.rc.in courier-0.64.2/courier/imapd.rc.in |
2 | --- courier-0.64.2.orig//courier/imapd.rc.in 2005-07-02 04:11:16.000000000 +0200 | |
3 | +++ courier-0.64.2/courier/imapd.rc.in 2010-05-08 23:30:04.683888399 +0200 | |
f7e6e3e9 | 4 | @@ -48,6 +48,7 @@ |
6ec524db AA |
5 | ;; |
6 | stop) | |
f7e6e3e9 | 7 | @courierlogger@ -pid=$PIDFILE -stop |
6ec524db AA |
8 | + rm -f $PIDFILE |
9 | ;; | |
10 | restart) | |
f7e6e3e9 | 11 | @courierlogger@ -pid=$PIDFILE -restart |
ed681050 JB |
12 | --- courier-1.1.8.orig//courier/imapd-ssl.rc.in 2005-07-03 00:53:19.000000000 +0200 |
13 | +++ courier-1.1.8/courier/imapd-ssl.rc.in 2010-05-08 23:30:04.685962634 +0200 | |
14 | @@ -73,6 +73,7 @@ start) | |
6ec524db AA |
15 | ;; |
16 | stop) | |
f7e6e3e9 | 17 | @courierlogger@ -pid=$SSLPIDFILE -stop |
6ec524db AA |
18 | + rm -f $SSLPIDFILE |
19 | ;; | |
ed681050 JB |
20 | restart) |
21 | @courierlogger@ -pid=$SSLPIDFILE -restart | |
d17b8ca4 | 22 | diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd.in courier-0.64.2/courier/module.esmtp/esmtpd.in |
23 | --- courier-0.64.2.orig//courier/module.esmtp/esmtpd.in 2009-07-30 04:29:54.000000000 +0200 | |
24 | +++ courier-0.64.2/courier/module.esmtp/esmtpd.in 2010-05-08 23:30:04.695962596 +0200 | |
6ec524db AA |
25 | @@ -38,6 +38,7 @@ |
26 | ;; | |
27 | stop) | |
28 | ${sbindir}/couriertcpd -pid=$PIDFILE -stop | |
29 | + rm -f $PIDFILE | |
30 | exit 0 | |
31 | ;; | |
32 | restart) | |
d17b8ca4 | 33 | diff -urN courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.in courier-0.64.2/courier/module.esmtp/esmtpd-ssl.in |
34 | --- courier-0.64.2.orig//courier/module.esmtp/esmtpd-ssl.in 2009-07-30 04:29:54.000000000 +0200 | |
35 | +++ courier-0.64.2/courier/module.esmtp/esmtpd-ssl.in 2010-05-08 23:30:04.695962596 +0200 | |
6328c7a3 | 36 | @@ -28,6 +28,7 @@ |
6ec524db AA |
37 | ;; |
38 | stop) | |
39 | ${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop | |
40 | + rm -f $SSLPIDFILE | |
41 | exit 0 | |
42 | ;; | |
43 | restart) | |
d17b8ca4 | 44 | diff -urN courier-0.64.2.orig//courier/pop3d.in courier-0.64.2/courier/pop3d.in |
45 | --- courier-0.64.2.orig//courier/pop3d.in 2005-07-02 04:11:16.000000000 +0200 | |
46 | +++ courier-0.64.2/courier/pop3d.in 2010-05-08 23:30:04.695962596 +0200 | |
6ec524db AA |
47 | @@ -42,6 +42,7 @@ |
48 | ;; | |
49 | stop) | |
f7e6e3e9 | 50 | @courierlogger@ -pid=$PIDFILE -stop |
6ec524db AA |
51 | + rm -f $PIDFILE |
52 | exit 0 | |
53 | ;; | |
54 | restart) | |
d17b8ca4 | 55 | diff -urN courier-0.64.2.orig//courier/pop3d-ssl.in courier-0.64.2/courier/pop3d-ssl.in |
56 | --- courier-0.64.2.orig//courier/pop3d-ssl.in 2005-07-03 01:24:34.000000000 +0200 | |
57 | +++ courier-0.64.2/courier/pop3d-ssl.in 2010-05-08 23:30:04.695962596 +0200 | |
f7e6e3e9 | 58 | @@ -52,6 +52,7 @@ |
6ec524db AA |
59 | ;; |
60 | stop) | |
f7e6e3e9 | 61 | @courierlogger@ -pid=$SSLPIDFILE -stop |
6ec524db AA |
62 | + rm -f $SSLPIDFILE |
63 | ;; | |
64 | restart) | |
f7e6e3e9 | 65 | @courierlogger@ -pid=$SSLPIDFILE -restart |
d17b8ca4 | 66 | diff -urN courier-0.64.2.orig//courier/webmaild.in courier-0.64.2/courier/webmaild.in |
67 | --- courier-0.64.2.orig//courier/webmaild.in 2007-07-01 00:07:21.000000000 +0200 | |
68 | +++ courier-0.64.2/courier/webmaild.in 2010-05-08 23:30:04.695962596 +0200 | |
69 | @@ -43,6 +43,8 @@ | |
2338deaf | 70 | stop) |
33c18667 AA |
71 | @courierlogger@ -pid=${PIDFILE} -stop |
72 | @courierlogger@ -pid=${PIDFILE}.pcp -stop | |
2338deaf AA |
73 | + rm -f ${PIDFILE} |
74 | + rm -f ${PIDFILE}.pcp | |
75 | ;; | |
c98d2bc8 AA |
76 | reload) |
77 | @courierlogger@ -pid=${PIDFILE} -restart | |
d17b8ca4 | 78 | diff -urN courier-0.64.2.orig//courier.sysvinit.in courier-0.64.2/courier.sysvinit.in |
79 | --- courier-0.64.2.orig//courier.sysvinit.in 2009-08-29 04:51:52.000000000 +0200 | |
80 | +++ courier-0.64.2/courier.sysvinit.in 2010-05-08 23:30:04.695962596 +0200 | |
6ec524db AA |
81 | @@ -8,6 +8,9 @@ |
82 | # | |
83 | # | |
84 | ||
85 | +# Source function library | |
86 | +. /etc/rc.d/init.d/functions | |
87 | + | |
88 | prefix="@prefix@" | |
89 | exec_prefix="@exec_prefix@" | |
d17b8ca4 | 90 | datarootdir="@datarootdir@" |
91 | @@ -25,6 +28,11 @@ | |
6ec524db AA |
92 | |
93 | case "$1" in | |
94 | start) | |
95 | + if [ -e /var/lock/subsys/courier ]; then | |
96 | + msg_already_running Courier | |
97 | + exit 0 | |
98 | + fi | |
99 | + | |
100 | cd / | |
101 | # Start daemons. | |
102 | touch /var/lock/subsys/courier | |
d17b8ca4 | 103 | @@ -200,6 +208,8 @@ |
6ec524db AA |
104 | echo "" |
105 | ;; | |
106 | stop) | |
107 | + if [ -e /var/lock/subsys/courier ]; then | |
108 | + | |
6ec524db AA |
109 | echo -n "Stopping Courier mail server:" |
110 | ||
d17b8ca4 | 111 | if test -x ${bindir}/webmlmd |
112 | @@ -260,6 +270,11 @@ | |
6ec524db AA |
113 | ${sbindir}/courierfilter stop |
114 | echo " courierfilter" | |
c98d2bc8 | 115 | rm -f /var/lock/subsys/courier |
6ec524db AA |
116 | + |
117 | + else | |
c98d2bc8 | 118 | + msg_not_running Courier |
6ec524db | 119 | + fi |
c98d2bc8 | 120 | + |
6ec524db AA |
121 | ;; |
122 | restart) | |
123 | $0 stop |