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

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

Revision: 6177
          http://sourceforge.net/p/astlinux/code/6177
Author:   abelbeck
Date:     2013-08-26 22:44:36 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
prosody, pubsub support, add new variables: XMPP_PUBSUB, XMPP_PUBSUB_ADMINS and XMPP_PUBSUB_AUTOCREATE

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-08-22 19:46:33 UTC (rev 6176)
+++ branches/1.0/package/prosody/prosody.init	2013-08-26 22:44:36 UTC (rev 6177)
@@ -154,8 +154,27 @@
 
   if [ -n "$XMPP_CONFERENCE" ]; then
     echo "Component \"$XMPP_CONFERENCE\" \"muc\""
+    echo ""
   fi
 
+  if [ -n "$XMPP_PUBSUB" ]; then
+    echo "Component \"$XMPP_PUBSUB\" \"pubsub\""
+    if [ -n "$XMPP_PUBSUB_ADMINS" ]; then
+      admins=""
+      for m in $XMPP_PUBSUB_ADMINS; do
+        admins="$admins${admins:+, }\"$m\""
+      done
+      echo "  admins = { $admins }"
+    fi
+    if [ "$XMPP_PUBSUB_AUTOCREATE" = "yes" -o "$XMPP_PUBSUB_AUTOCREATE" = "subscribe" ]; then
+      echo "  autocreate_on_subscribe = true"
+    fi
+    if [ "$XMPP_PUBSUB_AUTOCREATE" = "yes" -o "$XMPP_PUBSUB_AUTOCREATE" = "publish" ]; then
+      echo "  autocreate_on_publish = true"
+    fi
+    echo ""
+  fi
+
   return 0
 }
 

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-08-22 19:46:33 UTC (rev 6176)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-08-26 22:44:36 UTC (rev 6177)
@@ -454,7 +454,10 @@
 #XMPP_ADMIN_USERS=""              # Space separated list of accounts that are admins for the server.
 #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_CONFERENCE=""               # Enable a multi-user chat room service, ie. conference.host.example.com
+#XMPP_PUBSUB=""                   # Enable a pubsub service, ie. pubsub.host.example.com
+#XMPP_PUBSUB_ADMINS=""            # Space separated list of accounts that are admins for the pubsub service in addition to XMPP_ADMIN_USERS.
+#XMPP_PUBSUB_AUTOCREATE=""        # Enable autocreate, "subscribe" only, "publish" only, "yes" both subscribe and publish, defaults to "no".
 #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

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