thomas: server/kolabd/kolabd/templates cyrus.conf.template.in, 1.4, 1.5 httpd.conf.template.in, 1.12, 1.13 rc.conf.template.in, 1.3, 1.4

[cvs at kolab.org]

Author: thomas

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

Modified Files:
	cyrus.conf.template.in httpd.conf.template.in 
	rc.conf.template.in 
Log Message:
Allow to bind services to a specific IP address.


Index: cyrus.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/cyrus.conf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cyrus.conf.template.in	8 Oct 2007 15:38:05 -0000	1.4
+++ cyrus.conf.template.in	8 Oct 2007 15:39:27 -0000	1.5
@@ -27,21 +27,21 @@
 # UNIX sockets start with a slash and are put into /openpkg/var/imapd/sockets
 SERVICES {
 @@@if cyrus-imap@@@
-  imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="143" prefork=0
+  imap cmd="imapd -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@: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
+  imaps cmd="imapd -s -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:993" prefork=0
 @@@endif@@@
 @@@if cyrus-pop3@@@
-  pop3 cmd="pop3d -C @imap_confdir@/imapd.conf" listen="110" prefork=0
+  pop3 cmd="pop3d -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:110" prefork=0
 @@@endif@@@
 @@@if cyrus-pop3s@@@
-  pop3s cmd="pop3d -s -C @imap_confdir@/imapd.conf" listen="995" prefork=0
+  pop3s cmd="pop3d -s -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:995" prefork=0
 @@@endif@@@
 @@@if cyrus-sieve@@@
-  sieve cmd="timsieved -C @imap_confdir@/imapd.conf" listen="2000" prefork=0
+  sieve cmd="timsieved -C @imap_confdir@/imapd.conf" listen="@@@bind_addr@@@:2000" prefork=0
 @@@endif@@@
 
 #@@@if is-master@@@

Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- httpd.conf.template.in	4 Oct 2007 09:47:41 -0000	1.12
+++ httpd.conf.template.in	8 Oct 2007 15:39:27 -0000	1.13
@@ -110,8 +110,13 @@
 MaxRequestsPerChild  0
 </IfModule>
 
+@@@if bind_any@@@
 Listen 80
 Listen 443
+@@@else@@@
+Listen @@@bind_addr@@@:80
+Listen @@@bind_addr@@@:443
+@@@endif@@@
 
 
 ### Section 2: 'Main' server configuration

Index: rc.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/rc.conf.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rc.conf.template.in	6 Sep 2007 09:05:14 -0000	1.3
+++ rc.conf.template.in	8 Oct 2007 15:39:27 -0000	1.4
@@ -11,7 +11,7 @@
 # this file is automatically written by the Kolab config backend
 # manual additions are lost unless made to the template in the Kolab config directory
 
-openldap_url="ldap:// ldaps://"
+openldap_url="ldap://@@@bind_addr@@@/ ldaps://@@@bind_addr@@@/"
 sasl_authmech="ldap"
 
 @@@if proftpd-ftp@@@