]>
Commit | Line | Data |
---|---|---|
6ec524db | 1 | diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in |
f7e6e3e9 AA |
2 | --- old/courier/imapd.rc.in 2005-07-02 02:11:16.000000000 +0000 |
3 | +++ new/courier/imapd.rc.in 2005-08-16 20:48:40.869430152 +0000 | |
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 |
6ec524db | 12 | diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in |
f7e6e3e9 AA |
13 | --- old/courier/imapd-ssl.rc.in 2005-07-02 23:51:38.000000000 +0000 |
14 | +++ new/courier/imapd-ssl.rc.in 2005-08-16 20:49:03.195036144 +0000 | |
15 | @@ -49,6 +49,7 @@ | |
6ec524db AA |
16 | ;; |
17 | stop) | |
f7e6e3e9 | 18 | @courierlogger@ -pid=$SSLPIDFILE -stop |
6ec524db AA |
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 | |
c98d2bc8 AA |
24 | --- old/courier/module.esmtp/esmtpd.in 2005-02-16 23:42:13.000000000 +0000 |
25 | +++ new/courier/module.esmtp/esmtpd.in 2005-07-03 22:13:30.440224352 +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 | |
c98d2bc8 AA |
35 | --- old/courier/module.esmtp/esmtpd-ssl.in 2005-02-16 23:42:13.000000000 +0000 |
36 | +++ new/courier/module.esmtp/esmtpd-ssl.in 2005-07-03 22:13:01.767583256 +0000 | |
6328c7a3 | 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 | |
f7e6e3e9 AA |
46 | --- old/courier/pop3d.in 2005-07-02 02:11:16.000000000 +0000 |
47 | +++ new/courier/pop3d.in 2005-08-16 20:49:27.358362760 +0000 | |
6ec524db AA |
48 | @@ -42,6 +42,7 @@ |
49 | ;; | |
50 | stop) | |
f7e6e3e9 | 51 | @courierlogger@ -pid=$PIDFILE -stop |
6ec524db AA |
52 | + rm -f $PIDFILE |
53 | exit 0 | |
54 | ;; | |
55 | restart) | |
56 | diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in | |
f7e6e3e9 AA |
57 | --- old/courier/pop3d-ssl.in 2005-07-02 23:51:38.000000000 +0000 |
58 | +++ new/courier/pop3d-ssl.in 2005-08-16 20:49:16.509012112 +0000 | |
59 | @@ -52,6 +52,7 @@ | |
6ec524db AA |
60 | ;; |
61 | stop) | |
f7e6e3e9 | 62 | @courierlogger@ -pid=$SSLPIDFILE -stop |
6ec524db AA |
63 | + rm -f $SSLPIDFILE |
64 | ;; | |
65 | restart) | |
f7e6e3e9 | 66 | @courierlogger@ -pid=$SSLPIDFILE -restart |
2338deaf | 67 | diff -Nur old/courier/webmaild.in new/courier/webmaild.in |
c98d2bc8 AA |
68 | --- old/courier/webmaild.in 2005-02-16 23:42:13.000000000 +0000 |
69 | +++ new/courier/webmaild.in 2005-07-03 22:15:29.401139544 +0000 | |
70 | @@ -42,6 +42,8 @@ | |
2338deaf | 71 | stop) |
33c18667 AA |
72 | @courierlogger@ -pid=${PIDFILE} -stop |
73 | @courierlogger@ -pid=${PIDFILE}.pcp -stop | |
2338deaf AA |
74 | + rm -f ${PIDFILE} |
75 | + rm -f ${PIDFILE}.pcp | |
76 | ;; | |
c98d2bc8 AA |
77 | reload) |
78 | @courierlogger@ -pid=${PIDFILE} -restart | |
6ec524db | 79 | diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in |
c98d2bc8 AA |
80 | --- old/courier.sysvinit.in 2005-05-12 15:21:52.000000000 +0000 |
81 | +++ new/courier.sysvinit.in 2005-07-03 22:12:14.255806144 +0000 | |
6ec524db AA |
82 | @@ -8,6 +8,9 @@ |
83 | # | |
84 | # | |
85 | ||
86 | +# Source function library | |
87 | +. /etc/rc.d/init.d/functions | |
88 | + | |
89 | prefix="@prefix@" | |
90 | exec_prefix="@exec_prefix@" | |
91 | sysconfdir="@sysconfdir@" | |
92 | @@ -24,6 +27,11 @@ | |
93 | ||
94 | case "$1" in | |
95 | start) | |
96 | + if [ -e /var/lock/subsys/courier ]; then | |
97 | + msg_already_running Courier | |
98 | + exit 0 | |
99 | + fi | |
100 | + | |
101 | cd / | |
102 | # Start daemons. | |
103 | touch /var/lock/subsys/courier | |
c98d2bc8 | 104 | @@ -190,6 +198,8 @@ |
6ec524db AA |
105 | echo "" |
106 | ;; | |
107 | stop) | |
108 | + if [ -e /var/lock/subsys/courier ]; then | |
109 | + | |
6ec524db AA |
110 | echo -n "Stopping Courier mail server:" |
111 | ||
112 | if test -x ${sbindir}/imapd | |
c98d2bc8 | 113 | @@ -244,6 +254,11 @@ |
6ec524db AA |
114 | ${sbindir}/courierfilter stop |
115 | echo " courierfilter" | |
c98d2bc8 | 116 | rm -f /var/lock/subsys/courier |
6ec524db AA |
117 | + |
118 | + else | |
c98d2bc8 | 119 | + msg_not_running Courier |
6ec524db | 120 | + fi |
c98d2bc8 | 121 | + |
6ec524db AA |
122 | ;; |
123 | restart) | |
124 | $0 stop |