summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/templates/cyrus.conf.template.in10
-rw-r--r--conf/templates/httpd.conf.template.in5
-rw-r--r--conf/templates/rc.conf.template.in2
3 files changed, 11 insertions, 6 deletions
diff --git a/conf/templates/cyrus.conf.template.in b/conf/templates/cyrus.conf.template.in
index 9414bc1..74d54fa 100644
--- a/conf/templates/cyrus.conf.template.in
+++ b/conf/templates/cyrus.conf.template.in
@@ -27,21 +27,21 @@ START {
# 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@@@
diff --git a/conf/templates/httpd.conf.template.in b/conf/templates/httpd.conf.template.in
index 7650c8b..01061a1 100644
--- a/conf/templates/httpd.conf.template.in
+++ b/conf/templates/httpd.conf.template.in
@@ -108,8 +108,13 @@ MaxThreadsPerChild 20
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
diff --git a/conf/templates/rc.conf.template.in b/conf/templates/rc.conf.template.in
index cd8c678..aba1ee6 100644
--- a/conf/templates/rc.conf.template.in
+++ b/conf/templates/rc.conf.template.in
@@ -17,7 +17,7 @@ apache_err_files="@webserver_errorlogfile@"
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@@@