thomas: server/kolabd/kolabd/templates cyrus.conf.template.in, 1.3.2.1, 1.3.2.2 httpd.conf.template.in, 1.8, 1.8.2.1 rc.conf.template.in, 1.1.2.1, 1.1.2.2
cvs at kolab.org
cvs at kolab.org
Wed Sep 19 19:06:13 CEST 2007
Author: thomas
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv6802/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_1_branch
cyrus.conf.template.in httpd.conf.template.in
rc.conf.template.in
Log Message:
Allow to bind servives 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.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- cyrus.conf.template.in 19 Sep 2007 17:05:49 -0000 1.3.2.1
+++ cyrus.conf.template.in 19 Sep 2007 17:06:11 -0000 1.3.2.2
@@ -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.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- httpd.conf.template.in 5 Feb 2007 14:57:00 -0000 1.8
+++ httpd.conf.template.in 19 Sep 2007 17:06:11 -0000 1.8.2.1
@@ -108,8 +108,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.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- rc.conf.template.in 5 Sep 2007 15:50:49 -0000 1.1.2.1
+++ rc.conf.template.in 19 Sep 2007 17:06:11 -0000 1.1.2.2
@@ -17,7 +17,7 @@
imapd_master_file="@imap_masterlogfile@"
imapd_misc_file="@imap_misclogfile@"
-openldap_url="ldap:// ldaps://"
+openldap_url="ldap://@@@bind_addr@@@/ ldaps://@@@bind_addr@@@/"
sasl_authmech="ldap"
@@@if proftpd-ftp@@@
More information about the commits
mailing list