From cd1b4a2371f0f17de63cd374fa51ed3e0dcd40c0 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Fri, 12 Sep 2014 22:09:24 -0400 Subject: [PATCH] Update xmpp-setup to work with ejabberd >= 14.07 --- actions/xmpp-setup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/actions/xmpp-setup b/actions/xmpp-setup index 9a9e910ad..e8c07964e 100755 --- a/actions/xmpp-setup +++ b/actions/xmpp-setup @@ -1,6 +1,6 @@ #!/bin/sh -if grep --quiet "^{access, register, \[{allow, all}\]}." /etc/ejabberd/ejabberd.cfg; then +if grep --quiet "ip_access: all" /etc/ejabberd/ejabberd.yml; then xmpp_inband_enable=true else xmpp_inband_enable=false @@ -38,9 +38,9 @@ done if [ "$xmpp_inband_enable" != "$xmpp_inband_enable_cur" ] ; then if $xmpp_inband_enable ; then - sed -i s/"^{access, register, \[{deny, all}\]}."/"{access, register, \[{allow, all}\]}."/ /etc/ejabberd/ejabberd.cfg + sed -i s/"ip_access: trusted_network"/"ip_access: all"/ /etc/ejabberd/ejabberd.yml else - sed -i s/"^{access, register, \[{allow, all}\]}."/"{access, register, \[{deny, all}\]}."/ /etc/ejabberd/ejabberd.cfg + sed -i s/"ip_access: all"/"ip_access: trusted_network"/ /etc/ejabberd/ejabberd.yml fi ejabberdctl restart fi