summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2007-09-19 17:05:49 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2007-09-19 17:05:49 (GMT)
commit692d0e0b7a7b2f40c2d293d1f0d5bc6b812ad3c6 (patch)
treee333ce7a75dcafd9aae17b40a8d5420620d82995
parent5940e90f5ecad4e4fe99c4a8a3937b42d8e131c4 (diff)
downloadkolab-conf-692d0e0b7a7b2f40c2d293d1f0d5bc6b812ad3c6.tar.gz
Make cyrus configs use local_addr setting
-rw-r--r--conf/templates/cyrus.conf.template.in24
1 files changed, 18 insertions, 6 deletions
diff --git a/conf/templates/cyrus.conf.template.in b/conf/templates/cyrus.conf.template.in
index 9b6e7d9..9414bc1 100644
--- a/conf/templates/cyrus.conf.template.in
+++ b/conf/templates/cyrus.conf.template.in
@@ -26,11 +26,23 @@ START {
# UNIX sockets start with a slash and are put into /openpkg/var/imapd/sockets
SERVICES {
- @@@cyrus-imap@@@
- @@@cyrus-imaps@@@
- @@@cyrus-pop3@@@
- @@@cyrus-pop3s@@@
- @@@cyrus-sieve@@@
+@@@if cyrus-imap@@@
+ imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="143" prefork=0
+@@@else@@@
+ imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="@@@local_addr@@@:143" prefork=0
+@@@endif@@@
+@@@if cyrus-imaps@@@
+ imaps cmd="imapd -s -C @imap_confdir@/imapd.conf" listen="993" prefork=0
+@@@endif@@@
+@@@if cyrus-pop3@@@
+ pop3 cmd="pop3d -C @imap_confdir@/imapd.conf" listen="110" prefork=0
+@@@endif@@@
+@@@if cyrus-pop3s@@@
+ pop3s cmd="pop3d -s -C @imap_confdir@/imapd.conf" listen="995" prefork=0
+@@@endif@@@
+@@@if cyrus-sieve@@@
+ sieve cmd="timsieved -C @imap_confdir@/imapd.conf" listen="2000" prefork=0
+@@@endif@@@
#@@@if is-master@@@
# mupdate cmd="mupdate -m" listen=3905 prefork=1
@@ -38,7 +50,7 @@ SERVICES {
# LMTP is required for delivery
lmtpunix cmd="lmtpd" listen="@emailserver_socket@" prefork=0
- lmtp cmd="lmtpd -a" listen="127.0.0.1:2003"
+ lmtp cmd="lmtpd -a" listen="@@@local_addr@@@:2003"
# this is only necessary if using notifications
notify cmd="notifyd" listen="@imap_notify_socket@" proto="udp" prefork=1