]>
Commit | Line | Data |
---|---|---|
1 | diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in | |
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 @@ | |
5 | ;; | |
6 | stop) | |
7 | @courierlogger@ -pid=$PIDFILE -stop | |
8 | + rm -f $PIDFILE | |
9 | ;; | |
10 | restart) | |
11 | @courierlogger@ -pid=$PIDFILE -restart | |
12 | diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in | |
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 @@ | |
16 | ;; | |
17 | stop) | |
18 | @courierlogger@ -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 | |
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 | |
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 | |
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 | |
37 | @@ -28,6 +28,7 @@ | |
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 | |
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 | |
48 | @@ -42,6 +42,7 @@ | |
49 | ;; | |
50 | stop) | |
51 | @courierlogger@ -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 | |
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 @@ | |
60 | ;; | |
61 | stop) | |
62 | @courierlogger@ -pid=$SSLPIDFILE -stop | |
63 | + rm -f $SSLPIDFILE | |
64 | ;; | |
65 | restart) | |
66 | @courierlogger@ -pid=$SSLPIDFILE -restart | |
67 | diff -Nur old/courier/webmaild.in new/courier/webmaild.in | |
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 @@ | |
71 | stop) | |
72 | @courierlogger@ -pid=${PIDFILE} -stop | |
73 | @courierlogger@ -pid=${PIDFILE}.pcp -stop | |
74 | + rm -f ${PIDFILE} | |
75 | + rm -f ${PIDFILE}.pcp | |
76 | ;; | |
77 | reload) | |
78 | @courierlogger@ -pid=${PIDFILE} -restart | |
79 | diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in | |
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 | |
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 | |
104 | @@ -190,6 +198,8 @@ | |
105 | echo "" | |
106 | ;; | |
107 | stop) | |
108 | + if [ -e /var/lock/subsys/courier ]; then | |
109 | + | |
110 | echo -n "Stopping Courier mail server:" | |
111 | ||
112 | if test -x ${sbindir}/imapd | |
113 | @@ -244,6 +254,11 @@ | |
114 | ${sbindir}/courierfilter stop | |
115 | echo " courierfilter" | |
116 | rm -f /var/lock/subsys/courier | |
117 | + | |
118 | + else | |
119 | + msg_not_running Courier | |
120 | + fi | |
121 | + | |
122 | ;; | |
123 | restart) | |
124 | $0 stop |