thomas: server/kolabd/kolabd/templates cyrus.conf.template.in, 1.3, 1.3.2.1

cvs at kolab.org cvs at kolab.org
Wed Sep 19 19:05:51 CEST 2007


Author: thomas

Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv6759/kolabd/kolabd/templates

Modified Files:
      Tag: kolab_2_1_branch
	cyrus.conf.template.in 
Log Message:
Make cyrus configs use local_addr setting


Index: cyrus.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/cyrus.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- cyrus.conf.template.in	12 Apr 2007 11:52:24 -0000	1.3
+++ cyrus.conf.template.in	19 Sep 2007 17:05:49 -0000	1.3.2.1
@@ -26,11 +26,23 @@
 
 # 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 @@
 
   # 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





More information about the commits mailing list