[Astlinux-commits] SF.net SVN: astlinux:[5917] branches/1.0

[<abe...@us...>]

Revision: 5917
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5917&view=rev
Author:   abelbeck
Date:     2013-01-21 08:08:32 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
prosody, add XMPP_GROUPS variable to enable 'mod_groups'

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-21 02:21:24 UTC (rev 5916)
+++ branches/1.0/package/prosody/prosody.init	2013-01-21 08:08:32 UTC (rev 5917)
@@ -26,7 +26,7 @@
 gen_xmpp_config()
 {
   local m vh MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error c2s_port s2s_port
-  local LOG_OK SYSLOG_OK ERROR_LOG IFS c2s_idle_timeout
+  local LOG_OK SYSLOG_OK ERROR_LOG GROUPS_OK IFS c2s_idle_timeout
 
   cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
   key="${XMPP_KEY:-/etc/prosody/certs/server.key}"
@@ -45,6 +45,15 @@
     no_s2s="true"
   fi
 
+  if [ "$XMPP_GROUPS" = "yes" ]; then
+    MODS="$MODS groups"
+    GROUPS_OK=""
+    touch /mnt/kd/prosody/sharedgroups.conf
+    chown prosody:prosody /mnt/kd/prosody/sharedgroups.conf
+  else
+    GROUPS_OK="-- "
+  fi
+
   if [ -n "$XMPP_C2S_IDLE_TIMEOUT" ]; then
     MODS="$MODS pinger"
     c2s_idle_timeout="$XMPP_C2S_IDLE_TIMEOUT"
@@ -117,6 +126,8 @@
 
 s2s_ports = { $s2s_port }
 
+${GROUPS_OK}groups_file = \"/mnt/kd/prosody/sharedgroups.conf\"
+
 admins = { $admins }
 
 log = {

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-21 02:21:24 UTC (rev 5916)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-01-21 08:08:32 UTC (rev 5917)
@@ -449,6 +449,7 @@
 #XMPP_ENABLE_MODULES=""           # Space separated list of modules to enable, not enabled by default.
 #XMPP_DISABLE_MODULES=""          # Space separated list of default modules not to enable.
 #XMPP_CONFERENCE=""               # Enable a multi-user chat room server, ie. conference.host.example.com
+#XMPP_GROUPS="no"                 # Enable shared groups, "no", "yes", defaults to "no"
 #XMPP_C2S_IDLE_TIMEOUT="300"      # Send server-to-client ping every "nnn" seconds and timeout if no reply, disabled if ""
 #XMPP_C2S_PORT="5222"             # TCP Port for client-to-server connections, defaults to 5222
 #XMPP_S2S_PORT="5269"             # TCP Port for server-to-server connections, defaults to 5269

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.