more tweaks

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5929 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml
index ef16ca3c46c24cdd733a7972974fa656d8852e14..52c46f179485658f244407c248043bd5a8b4baff 100644 (file)
--- a/conf/freeswitch.xml
+++ b/conf/freeswitch.xml
@@ -12,59 +12,10 @@
       The preprocessor will compile the full xml document to ${prefix}/log/freeswitch.registry
       Don't modify it while freeswitch is running cos it is mem mapped in most cases =D
   -->
-
-  <!-- Preprocessor Variables
-       These are introduced when configuration strings must be consistent across modules. 
-   -->
-  <!-- sip_profile 
-       Must be a domain name if you are being a registry server; otherwise
-       can be any string.
-       used by: sofia.conf.xml enum.conf.xml default_context.xml directory.xml
-  --> 
-  <!--#set "domain=$${local_ip_v4}"-->
-  <!--#set "sip_profile=$${domain}"-->
-  <!-- xmpp_client_profile and xmpp_server_profile
-       xmpp_client_profile can be any string. 
-       xmpp_server_profile is appended to "dingaling_" to form the database name
-       containing the "subscriptions" table.
-       used by: dingaling.conf.xml enum.conf.xml 
-  --> 
-  <!--#set "global_codec_prefs=PCMU@20i"-->
-  <!--#set "xmpp_client_profile=xmppc"-->
-  <!--#set "xmpp_server_profile=xmpps"-->
-  <!-- bind_server_ip
-       Can be an ip address, a dns name, or "auto". 
-       This determines an ip address available on this host to bind.
-       If you are separating RTP and SIP traffic, you will want to have
-       use different addresses where this variable appears.
-       Used by: sofia.conf.xml dingaling.conf.xml
-  -->
-  <!--#set "bind_server_ip=auto"-->
-  <!-- external_rtp_ip
-       Used as the public IP address for SDP.
-       Can be an ip address or a string like "stun:stun.server.com" 
-       If unspecified, the bind_server_ip value is used.
-       Used by: sofia.conf.xml dingaling.conf.xml
-  -->
-  <!--#set "external_rtp_ip=stun:stun.fwdnet.net"-->
-  <!-- external_sip_ip
-       Used as the public IP address for SDP.
-       Can be an ip address or a string like "stun:stun.server.com" 
-       If unspecified, the bind_server_ip value is used.
-       Used by: sofia.conf.xml dingaling.conf.xml
-  -->
-  <!--#set "external_sip_ip=stun:stun.fwdnet.net"-->
-  <!-- server_name
-       A public ip address or DNS name that is used when advertising conference
-       presence or registering sip.
-       Used by: conference.conf.xml
-  --> 
-  <!-- outbound_caller_id and outbound_caller_name
-       The caller ID telephone number we should use when calling out.
-       Used by: conference.conf.xml
+  <!--#comment
+      vars.xml contains all the #set directives for the preprocessor.
   -->
-  <!--#set "outbound_caller_name=FreeSWITCH"-->
-  <!--#set "outbound_caller_id=8777423583"-->
+  <!--#include "vars.xml"-->
 
   <section name="configuration" description="Various Configuration">
     <!--#include "switch.conf.xml"-->

diff --git a/conf/vars.xml b/conf/vars.xml
new file mode 100644 (file)
index 0000000..a6e35cf
--- /dev/null
+++ b/conf/vars.xml
@@ -0,0 +1,53 @@
+  <!-- Preprocessor Variables
+       These are introduced when configuration strings must be consistent across modules. 
+   -->
+  <!--#set "domain=$${local_ip_v4}"-->
+  <!-- sip_profile 
+       Must be a domain name if you are being a registry server; otherwise
+       can be any string.
+       used by: sofia.conf.xml enum.conf.xml default_context.xml directory.xml
+  --> 
+  <!--#set "sip_profile=$${domain}"-->
+  <!-- xmpp_client_profile and xmpp_server_profile
+       xmpp_client_profile can be any string. 
+       xmpp_server_profile is appended to "dingaling_" to form the database name
+       containing the "subscriptions" table.
+       used by: dingaling.conf.xml enum.conf.xml 
+  --> 
+  <!--#set "global_codec_prefs=PCMU@20i"-->
+  <!--#set "xmpp_client_profile=xmppc"-->
+  <!--#set "xmpp_server_profile=xmpps"-->
+  <!-- bind_server_ip
+       Can be an ip address, a dns name, or "auto". 
+       This determines an ip address available on this host to bind.
+       If you are separating RTP and SIP traffic, you will want to have
+       use different addresses where this variable appears.
+       Used by: sofia.conf.xml dingaling.conf.xml
+  -->
+  <!--#set "bind_server_ip=auto"-->
+  <!-- external_rtp_ip
+       Used as the public IP address for SDP.
+       Can be an ip address or a string like "stun:stun.server.com" 
+       If unspecified, the bind_server_ip value is used.
+       Used by: sofia.conf.xml dingaling.conf.xml
+  -->
+  <!--#set "external_rtp_ip=stun:stun.fwdnet.net"-->
+  <!-- external_sip_ip
+       Used as the public IP address for SDP.
+       Can be an ip address or a string like "stun:stun.server.com" 
+       If unspecified, the bind_server_ip value is used.
+       Used by: sofia.conf.xml dingaling.conf.xml
+  -->
+  <!--#set "external_sip_ip=stun:stun.fwdnet.net"-->
+  <!-- server_name
+       A public ip address or DNS name that is used when advertising conference
+       presence or registering sip.
+       Used by: conference.conf.xml
+  --> 
+  <!-- outbound_caller_id and outbound_caller_name
+       The caller ID telephone number we should use when calling out.
+       Used by: conference.conf.xml
+  -->
+  <!--#set "outbound_caller_name=FreeSWITCH"-->
+  <!--#set "outbound_caller_id=8777423583"-->
+