install/mailsystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install_update_dovecot.sh: allow multiple XMMP listener adresses.

Browse Source
This commit is contained in:
Christoph 2020-04-25 11:02:13 +02:00
parent c911111bbb
commit e37164e5ff
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/install_update_dovecot.conf.sample
View File

@ -68,7 +68,7 @@ else
fi fi
xmpp_listener=false xmpp_listener=false
xmpp_listener_address="127.0.0.1" xmpp_listener_addresses="127.0.0.1 $ipv4"
xmpp_listener_port="4444" xmpp_listener_port="4444"
# --- # ---

10
install_update_dovecot.sh
View File

@ -165,7 +165,9 @@ fi
[[ -n "$xmpp_listener" ]] || xmpp_listener=false [[ -n "$xmpp_listener" ]] || xmpp_listener=false
if $xmpp_listener ; then 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" [[ -n "$xmpp_listener_port" ]] || xmpp_listener_port="44444"
fi fi
@ -353,7 +355,7 @@ echo -e "\tMax user connections per ip...: $max_userip_connections"
echo "" echo ""
echo -e "\tAuth Listener (Jabber)........: $xmpp_listener" echo -e "\tAuth Listener (Jabber)........: $xmpp_listener"
if $xmpp_listener ; then 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" echo -e "\t AUTH Listener PORT.........: $xmpp_listener_port"
fi fi
echo "" echo ""
@ -1189,7 +1191,7 @@ fi
## - ## -
## - # Auth Listener (XMPP - Jabber) ## - # Auth Listener (XMPP - Jabber)
## - inet_listener { ## - inet_listener {
## - address = $xmpp_listener_address ## - address = $xmpp_listener_addresses
## - port = $xmpp_listener_port ## - 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 /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true
if $xmpp_listener ; then 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 /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-master.conf || _failed=true
fi fi