From: Travis Cross <tc@traviscross.com>
Date: Sat, 25 Jan 2014 23:51:21 +0000 (+0000)
Subject: Fix broken paths and XML in conf/sbc
X-Git-Tag: v1.2.19~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d94fa5234f6929c30e3287e3cc12b6207cbd0af;p=thirdparty%2Ffreeswitch.git

Fix broken paths and XML in conf/sbc

Before Jay, no one must have actually tried using the example SBC
config.

Thanks-to: Jay Blinks <jaybinks@gmail.com>
Thanks-to: Cal Leeming <cal.leeming@simplicitymedialtd.co.uk>

FS-6144 --resolve
---

diff --git a/conf/sbc/autoload_configs/sofia.conf.xml b/conf/sbc/autoload_configs/sofia.conf.xml
index 24252d08ce..c41758beed 100644
--- a/conf/sbc/autoload_configs/sofia.conf.xml
+++ b/conf/sbc/autoload_configs/sofia.conf.xml
@@ -6,13 +6,8 @@
     <param name="debug-presence" value="0"/>
   </global_settings>
 
-  <!--
-      The rabbit hole goes deep.  This includes all the
-      profiles in the sip_profiles directory that is up
-      one level from this directory.
-  -->
   <profiles>
-    <X-PRE-PROCESS cmd="include" data="../sip_profiles/*.xml"/>
+    <X-PRE-PROCESS cmd="include" data="../sbc_profiles/*.xml"/>
   </profiles>
 
 </configuration>
diff --git a/conf/sbc/dialplan/default.xml b/conf/sbc/dialplan/default.xml
index 2280a041f3..3173e4d930 100644
--- a/conf/sbc/dialplan/default.xml
+++ b/conf/sbc/dialplan/default.xml
@@ -9,7 +9,6 @@
     will build the domains acl using this value.
 -->
 
-<?xml version="1.0" encoding="utf-8"?>
 <!-- http://wiki.freeswitch.org/wiki/Dialplan_XML -->
 <include>
   <context name="default">
diff --git a/conf/sbc/freeswitch.xml b/conf/sbc/freeswitch.xml
index e449978c76..ad7fd08b1c 100644
--- a/conf/sbc/freeswitch.xml
+++ b/conf/sbc/freeswitch.xml
@@ -1,4 +1,4 @@
-<include>
+<document type="freeswitch/xml">
   <!--#comment 
       All comments starting with #command will be preprocessed and never sent to the xml parser
       Valid instructions:
@@ -25,19 +25,7 @@
     <X-PRE-PROCESS cmd="include" data="dialplan/*.xml"/>
   </section>
 
-  <!-- mod_dingaling is reliant on the vcard data in the "directory" section. -->
-  <!-- mod_sofia is reliant on the user data for authorization --> 
-  <section name="directory" description="User Directory">
-    <X-PRE-PROCESS cmd="include" data="directory/*.xml"/>
-  </section>
-
-  <!-- phrases section (under development still) -->
-  <section name="phrases" description="Speech Phrase Management">
-    <macros>
-      <X-PRE-PROCESS cmd="include" data="lang/en/*.xml"/>
-    </macros>
-  </section>
-</include>
+</document>
 
 
 
diff --git a/conf/sbc/vars.xml b/conf/sbc/vars.xml
index 0fbcda17b8..52efb0683a 100644
--- a/conf/sbc/vars.xml
+++ b/conf/sbc/vars.xml
@@ -1,3 +1,4 @@
+<include>
   <!-- Preprocessor Variables
        These are introduced when configuration strings must be consistent across modules. 
    -->
@@ -150,3 +151,4 @@
   <X-PRE-PROCESS cmd="set" data="external_tls_port=5081"/>
   <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false"/>
   <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${base_dir}/conf/ssl"/>
+</include>