]>
Commit | Line | Data |
---|---|---|
6ec524db AA |
1 | diff -Nur old/courier/configure.in new/courier/configure.in |
2 | --- old/courier/configure.in 2003-10-30 00:53:31.000000000 +0000 | |
3 | +++ new/courier/configure.in 2004-03-02 12:51:12.000000000 +0000 | |
4 | @@ -547,6 +547,7 @@ | |
5 | ||
6 | eval "exec_prefix=$exec_prefix" | |
7 | eval "bindir=$bindir" | |
8 | +eval "datadir=$datadir" | |
9 | ||
10 | MAILDROP="$bindir/maildrop" | |
11 | AC_SUBST(MAILDROP) | |
12 | diff -Nur old/courier/imapd.rc.in new/courier/imapd.rc.in | |
13 | --- old/courier/imapd.rc.in 2004-02-24 15:15:10.000000000 +0000 | |
14 | +++ new/courier/imapd.rc.in 2004-03-02 12:44:49.000000000 +0000 | |
15 | @@ -53,6 +53,7 @@ | |
16 | ;; | |
17 | stop) | |
18 | @sbindir@/couriertcpd -pid=$PIDFILE -stop | |
19 | + rm -f $PIDFILE | |
20 | ;; | |
21 | restart) | |
22 | @sbindir@/couriertcpd -pid=$PIDFILE -restart | |
23 | diff -Nur old/courier/imapd-ssl.rc.in new/courier/imapd-ssl.rc.in | |
24 | --- old/courier/imapd-ssl.rc.in 2004-02-24 15:15:10.000000000 +0000 | |
25 | +++ new/courier/imapd-ssl.rc.in 2004-03-02 14:06:44.000000000 +0000 | |
26 | @@ -28,6 +28,11 @@ | |
27 | ||
28 | case $1 in | |
29 | start) | |
30 | + # If we do not have a certificate, make one up. | |
31 | + if [ ! -f @datadir@/imapd.pem ]; then | |
32 | + @sbindir@/mkimapdcert | |
33 | + fi | |
34 | + | |
35 | LIBAUTHMODULES="" | |
36 | for f in `echo $AUTHMODULES` | |
37 | do | |
38 | @@ -54,6 +59,7 @@ | |
39 | ;; | |
40 | stop) | |
41 | @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop | |
42 | + rm -f $SSLPIDFILE | |
43 | ;; | |
44 | esac | |
45 | exit 0 | |
46 | diff -Nur old/courier/module.esmtp/esmtpd.in new/courier/module.esmtp/esmtpd.in | |
47 | --- old/courier/module.esmtp/esmtpd.in 2001-08-05 20:36:08.000000000 +0000 | |
48 | +++ new/courier/module.esmtp/esmtpd.in 2004-03-02 12:44:24.000000000 +0000 | |
49 | @@ -38,6 +38,7 @@ | |
50 | ;; | |
51 | stop) | |
52 | ${sbindir}/couriertcpd -pid=$PIDFILE -stop | |
53 | + rm -f $PIDFILE | |
54 | exit 0 | |
55 | ;; | |
56 | restart) | |
57 | diff -Nur old/courier/module.esmtp/esmtpd-ssl.in new/courier/module.esmtp/esmtpd-ssl.in | |
58 | --- old/courier/module.esmtp/esmtpd-ssl.in 2002-07-09 19:38:18.000000000 +0000 | |
59 | +++ new/courier/module.esmtp/esmtpd-ssl.in 2004-03-02 14:06:51.000000000 +0000 | |
60 | @@ -25,9 +25,14 @@ | |
61 | ||
62 | case $1 in | |
63 | start) | |
64 | + # If we do not have a certificate, make one up. | |
65 | + if [ ! -f @datadir@/esmtpd.pem ]; then | |
66 | + @sbindir@/mkesmtpdcert | |
67 | + fi | |
68 | ;; | |
69 | stop) | |
70 | ${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop | |
71 | + rm -f $SSLPIDFILE | |
72 | exit 0 | |
73 | ;; | |
74 | restart) | |
75 | diff -Nur old/courier/pop3d.in new/courier/pop3d.in | |
76 | --- old/courier/pop3d.in 2004-02-24 15:15:10.000000000 +0000 | |
77 | +++ new/courier/pop3d.in 2004-03-02 12:45:16.000000000 +0000 | |
78 | @@ -42,6 +42,7 @@ | |
79 | ;; | |
80 | stop) | |
81 | ${sbindir}/couriertcpd -pid=$PIDFILE -stop | |
82 | + rm -f $PIDFILE | |
83 | exit 0 | |
84 | ;; | |
85 | restart) | |
86 | diff -Nur old/courier/pop3d-ssl.in new/courier/pop3d-ssl.in | |
87 | --- old/courier/pop3d-ssl.in 2004-02-24 15:15:10.000000000 +0000 | |
88 | +++ new/courier/pop3d-ssl.in 2004-03-02 14:06:40.000000000 +0000 | |
89 | @@ -29,6 +29,11 @@ | |
90 | ||
91 | case $1 in | |
92 | start) | |
93 | + # If we do not have a certificate, make one up. | |
94 | + if [ ! -f @datadir@/pop3d.pem ]; then | |
95 | + @sbindir@/mkpop3dcert | |
96 | + fi | |
97 | + | |
98 | LIBAUTHMODULES="" | |
99 | for f in `echo $AUTHMODULES` | |
100 | do | |
101 | @@ -58,6 +63,7 @@ | |
102 | ;; | |
103 | stop) | |
104 | @sbindir@/couriertcpd -pid=$SSLPIDFILE -stop | |
105 | + rm -f $SSLPIDFILE | |
106 | ;; | |
107 | restart) | |
108 | @sbindir@/couriertcpd -pid=$SSLPIDFILE -restart | |
109 | diff -Nur old/courier.sysvinit.in new/courier.sysvinit.in | |
110 | --- old/courier.sysvinit.in 2003-11-28 02:31:55.000000000 +0000 | |
111 | +++ new/courier.sysvinit.in 2004-03-02 17:06:32.000000000 +0000 | |
112 | @@ -8,6 +8,9 @@ | |
113 | # | |
114 | # | |
115 | ||
116 | +# Source function library | |
117 | +. /etc/rc.d/init.d/functions | |
118 | + | |
119 | prefix="@prefix@" | |
120 | exec_prefix="@exec_prefix@" | |
121 | sysconfdir="@sysconfdir@" | |
122 | @@ -24,6 +27,11 @@ | |
123 | ||
124 | case "$1" in | |
125 | start) | |
126 | + if [ -e /var/lock/subsys/courier ]; then | |
127 | + msg_already_running Courier | |
128 | + exit 0 | |
129 | + fi | |
130 | + | |
131 | cd / | |
132 | # Start daemons. | |
133 | touch /var/lock/subsys/courier | |
134 | @@ -209,6 +217,9 @@ | |
135 | echo "" | |
136 | ;; | |
137 | stop) | |
138 | + if [ -e /var/lock/subsys/courier ]; then | |
139 | + | |
140 | + rm -f /var/lock/subsys/courier | |
141 | echo -n "Stopping Courier mail server:" | |
142 | ||
143 | if test -x ${sbindir}/imapd | |
144 | @@ -273,6 +284,10 @@ | |
145 | fi | |
146 | ${sbindir}/courierfilter stop | |
147 | echo " courierfilter" | |
148 | + | |
149 | + else | |
150 | + msg_not_running Courier | |
151 | + fi | |
152 | ;; | |
153 | restart) | |
154 | $0 stop |