|
From: <abe...@us...> - 2013-01-10 14:05:34
|
Revision: 5884
http://astlinux.svn.sourceforge.net/astlinux/?rev=5884&view=rev
Author: abelbeck
Date: 2013-01-10 14:05:27 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
prosody, add XMPP_ENABLE_S2S config variable
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-01-09 19:47:03 UTC (rev 5883)
+++ branches/1.0/package/prosody/prosody.init 2013-01-10 14:05:27 UTC (rev 5884)
@@ -2,11 +2,13 @@
. /etc/rc.conf
-DEFAULT_MODULES="roster saslauth tls dialback disco \
+DEFAULT_MODULES="roster saslauth tls disco \
private vcard \
legacyauth version uptime time ping pep register adhoc \
admin_adhoc"
+DEFAULT_MODULES_S2S="dialback"
+
mod_in_list()
{
local match="$1" list="$2" IFS
@@ -23,7 +25,7 @@
gen_xmpp_config()
{
- local m ADD_MODS="" modules="" admins="" hostname cert key log syslog error
+ local m MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error
local LOG_OK SYSLOG_OK ERROR_LOG IFS
cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
@@ -35,13 +37,21 @@
return 1
fi
+ if [ "$XMPP_ENABLE_S2S" = "yes" ]; then
+ MODS="$DEFAULT_MODULES $DEFAULT_MODULES_S2S"
+ no_s2s="false"
+ else
+ MODS="$DEFAULT_MODULES"
+ no_s2s="true"
+ fi
+
unset IFS
for m in $XMPP_ENABLE_MODULES; do
- if ! mod_in_list "$m" "$DEFAULT_MODULES"; then
+ if ! mod_in_list "$m" "$MODS"; then
ADD_MODS="$ADD_MODS${ADD_MODS:+ }$m"
fi
done
- for m in $DEFAULT_MODULES $ADD_MODS; do
+ for m in $MODS $ADD_MODS; do
if ! mod_in_list "$m" "$XMPP_DISABLE_MODULES"; then
modules="$modules${modules:+, }\"$m\""
fi
@@ -86,7 +96,7 @@
authentication = \"internal_plain\"
-disallow_s2s = true
+disallow_s2s = $no_s2s
c2s_require_encryption = true
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-09 19:47:03 UTC (rev 5883)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-10 14:05:27 UTC (rev 5884)
@@ -441,6 +441,7 @@
## Data stored in /mnt/kd/prosody/ symlinked from /etc/prosody/
## Enable XMPP server by setting XMPP_ENABLE="yes"
#XMPP_ENABLE="yes"
+#XMPP_ENABLE_S2S="no" # Enable server-to-server connections, "no", "yes", defaults to "no"
#XMPP_HOSTNAME="host.example.com" # Defaults to "$HOSTNAME.$DOMAIN"
#XMPP_CERT="" # Defaults to "/etc/prosody/certs/server.crt"
#XMPP_KEY="" # Defaults to "/etc/prosody/certs/server.key"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|