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

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

Revision: 5886
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5886&view=rev
Author:   abelbeck
Date:     2013-01-11 00:18:23 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
prosody, add rc.conf variables XMPP_C2S_PORT and XMPP_S2S_PORT to define TCP ports

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-10 23:18:24 UTC (rev 5885)
+++ branches/1.0/package/prosody/prosody.init	2013-01-11 00:18:23 UTC (rev 5886)
@@ -25,7 +25,7 @@
 
 gen_xmpp_config()
 {
-  local m MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error
+  local m 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
 
   cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
@@ -63,6 +63,10 @@
 
   hostname="${XMPP_HOSTNAME:-$HOSTNAME.$DOMAIN}"
 
+  c2s_port="${XMPP_C2S_PORT:-5222}"
+
+  s2s_port="${XMPP_S2S_PORT:-5269}"
+
   log="${XMPP_LOG:-none}"
   if [ "$log" = "warn" -o "$log" = "info" -o "$log" = "debug" ]; then
     LOG_OK=""
@@ -100,6 +104,10 @@
 
 c2s_require_encryption = true
 
+c2s_ports = { $c2s_port }
+
+s2s_ports = { $s2s_port }
+
 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-10 23:18:24 UTC (rev 5885)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2013-01-11 00:18:23 UTC (rev 5886)
@@ -449,6 +449,8 @@
 #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_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
 #XMPP_LOG="none"                  # Enable /var/log/prosody/prosody.log: "none", "warn", "info", "debug"
 #XMPP_SYSLOG="warn"               # Enable syslog logging: "none", "error", "warn", "info"
 #XMPP_ERROR_LOG="no"              # Enable error logging /var/log/prosody/prosody.err: "no", "yes"

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