From e37164e5ff3a881e4c62efdc72aab403cdd03c60 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sat, 25 Apr 2020 11:02:13 +0200 Subject: [PATCH] install_update_dovecot.sh: allow multiple XMMP listener adresses. --- conf/install_update_dovecot.conf.sample | 2 +- install_update_dovecot.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/install_update_dovecot.conf.sample b/conf/install_update_dovecot.conf.sample index ddd6875..bc95712 100644 --- a/conf/install_update_dovecot.conf.sample +++ b/conf/install_update_dovecot.conf.sample @@ -68,7 +68,7 @@ else fi xmpp_listener=false -xmpp_listener_address="127.0.0.1" +xmpp_listener_addresses="127.0.0.1 $ipv4" xmpp_listener_port="4444" # --- diff --git a/install_update_dovecot.sh b/install_update_dovecot.sh index 7a7a738..475b93c 100755 --- a/install_update_dovecot.sh +++ b/install_update_dovecot.sh @@ -165,7 +165,9 @@ fi [[ -n "$xmpp_listener" ]] || xmpp_listener=false if $xmpp_listener ; then - [[ -n "$xmpp_listener_address" ]] || xmpp_listener_address="127.0.0.1" + # Be compartible with older installations + [[ -n "$xmpp_listener_address" ]] && xmpp_listener_addresses"$xmpp_listener_address" + [[ -n "$xmpp_listener_addresses" ]] || xmpp_listener_addresses="127.0.0.1 $ipv4" [[ -n "$xmpp_listener_port" ]] || xmpp_listener_port="44444" fi @@ -353,7 +355,7 @@ echo -e "\tMax user connections per ip...: $max_userip_connections" echo "" echo -e "\tAuth Listener (Jabber)........: $xmpp_listener" if $xmpp_listener ; then - echo -e "\t Auth Listener Addresses....: $xmpp_listener_address" + echo -e "\t Auth Listener Addresses....: $xmpp_listener_addresses" echo -e "\t AUTH Listener PORT.........: $xmpp_listener_port" fi echo "" @@ -1189,7 +1191,7 @@ fi ## - ## - # Auth Listener (XMPP - Jabber) ## - inet_listener { -## - address = $xmpp_listener_address +## - address = $xmpp_listener_addresses ## - port = $xmpp_listener_port ## - } ## - .. @@ -1249,7 +1251,7 @@ perl -i -n -p -e "s#^([ ]*)(inet_listener\ +pop3s.*)#\1\2\n\1 address = $pops_l /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true if $xmpp_listener ; then - perl -i -n -p -e "s#^([ ]*)(service auth\s+\{.*)#\1\2\n\n \# Auth Listener (XMPP - Jabber)\n inet_listener {\n address = $xmpp_listener_address\n port = $xmpp_listener_port\n }\n#g" \ + perl -i -n -p -e "s#^([ ]*)(service auth\s+\{.*)#\1\2\n\n \# Auth Listener (XMPP - Jabber)\n inet_listener {\n address = $xmpp_listener_addresses\n port = $xmpp_listener_port\n }\n#g" \ /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true fi