FS-7433

diff --git a/conf/vanilla/autoload_configs/logfile.conf.xml b/conf/vanilla/autoload_configs/logfile.conf.xml
index 546db4abafa359f006c30fad9fb447a36fad16f0..8e7f6c2d71d7a45aeaf408009a5a09e78850c8bc 100644 (file)
--- a/conf/vanilla/autoload_configs/logfile.conf.xml
+++ b/conf/vanilla/autoload_configs/logfile.conf.xml
@@ -22,7 +22,7 @@
             value is one or more of debug,info,notice,warning,err,crit,alert,all
             Please see comments in console.conf.xml for more information
        -->
-       <map name="all" value="debug,info,notice,warning,err,crit,alert"/>
+       <map name="all" value="console,debug,info,notice,warning,err,crit,alert"/>
       </mappings>
     </profile>
   </profiles>

diff --git a/conf/vanilla/autoload_configs/switch.conf.xml b/conf/vanilla/autoload_configs/switch.conf.xml
index 8e66e7159f5baa8d6fea63cee148078017a7c190..4ffe878563d046c2e747234e52c20ca0c3ad39e4 100644 (file)
--- a/conf/vanilla/autoload_configs/switch.conf.xml
+++ b/conf/vanilla/autoload_configs/switch.conf.xml
@@ -150,7 +150,7 @@
     <!-- Test each port to make sure it is not in use by some other process before allocating it to RTP -->
     <!-- <param name="rtp-port-usage-robustness" value="true"/> -->
 
-    <param name="rtp-enable-zrtp" value="true"/>
+    <param name="rtp-enable-zrtp" value="false"/>
 
     <!-- <param name="core-db-dsn" value="pgsql://hostaddr=127.0.0.1 dbname=freeswitch user=freeswitch password='' options='-c client_min_messages=NOTICE'" /> -->
     <!-- <param name="core-db-dsn" value="dsn:username:password" /> -->