From b269f72a0893ac20046c274e748cdaa140bbc2a9 Mon Sep 17 00:00:00 2001
From: titoko <titoko@titoko.fr>
Date: Tue, 8 Apr 2014 20:17:14 +0200
Subject: [PATCH] update conf

---
 conf/hosts.xml  | 31 ++++++++++++++-----------
 conf/main.xml   | 61 ++++++++++++++++++++++++++-----------------------
 conf/nginx.conf |  2 +-
 3 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/conf/hosts.xml b/conf/hosts.xml
index ddd42dd..ad7d401 100644
--- a/conf/hosts.xml
+++ b/conf/hosts.xml
@@ -1,14 +1,19 @@
-<?xml version="1.0" encoding="utf-8" ?>                                                                
-<jappix xmlns="jappix:conf:hosts">                                                                       
-  <main>DOMAINTOCHANGE</main>                                                                       
-  <muc>muc.DOMAINTOCHANGE</muc>                                                                       
-  <pubsub>pubsub.DOMAINTOCHANGE</pubsub>                                                                       
-  <vjud>vjud.DOMAINTOCHANGE</vjud>                                                                       
-  <anonymous>anonymous.DOMAINTOCHANGE</anonymous>                                                                       
-  <bosh>https://DOMAINTOCHANGEPATHTOCHANGE/http-bind</bosh>
-  <bosh_main></bosh_main>                                                                       
-  <bosh_mini></bosh_mini>                                                                       
-  <static></static>                                                                      
-  <upload></upload>                                                                      
-  <bosh_proxy>off</bosh_proxy>                                                                       
+<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:conf:hosts">
+    <main>DOMAINTOCHANGE</main>
+    <muc>muc.DOMAINTOCHANGE</muc>
+    <pubsub>pubsub.DOMAINTOCHANGE</pubsub>
+    <vjud>vjud.DOMAINTOCHANGE</vjud>
+    <anonymous>anonymous.DOMAINTOCHANGE</anonymous>
+    <stun>stun.jappix.com</stun>
+    <turn></turn>
+    <turn_username></turn_username>
+    <turn_password></turn_password>
+    <bosh>https://DOMAINTOCHANGEPATHTOCHANGE/http-bind</bosh>
+    <bosh_main></bosh_main>
+    <bosh_mini></bosh_mini>
+    <websocket></websocket>
+    <static></static>
+    <upload></upload>
+    <bosh_proxy>off</bosh_proxy>
 </jappix>
diff --git a/conf/main.xml b/conf/main.xml
index ecdb602..9dbd7eb 100644
--- a/conf/main.xml
+++ b/conf/main.xml
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <jappix xmlns="jappix:conf:main">
-	<name>YunoJappix</name>
-	<desc>a free social network</desc>
-	<owner_name></owner_name>
-	<owner_website></owner_website>
-	<legal></legal>
-	<resource>YunoJappix</resource>
-	<lock>on</lock>
-	<anonymous>off</anonymous>
-	<http_auth>on</http_auth>
-	<registration>off</registration>
-	<manager_link>on</manager_link>
-	<groupchats_join></groupchats_join>
-	<groupchats_suggest>off</groupchats_suggest>
-	<encryption>on</encryption>
-	<https_storage>off</https_storage>
-	<https_force>off</https_force>
-	<compression>off</compression>
-	<analytics_track>off</analytics_track>
-	<analytics_url></analytics_url>
-	<analytics_id></analytics_id>
-	<ads_enable>off</ads_enable>
-	<ads_standard></ads_standard>
-	<ads_content></ads_content>
-	<multi_files>off</multi_files>
-	<developer>off</developer>
-	<statistics>off</statistics>
-	<register_api>off</register_api>
-  <xmppd_ctl>/usr/bin/metronomectl</xmppd_ctl>
-	<xmppd>metronome</xmppd>
+    <name>YunoJappix</name>
+    <desc>a free social network</desc>
+    <owner_name></owner_name>
+    <owner_website></owner_website>
+    <legal></legal>
+    <language>fr</language>
+    <resource>YunoJappix</resource>
+    <lock>on</lock>
+    <anonymous>off</anonymous>
+    <http_auth>on</http_auth>
+    <registration>off</registration>
+    <manager_link>on</manager_link>
+    <groupchats_join></groupchats_join>
+    <groupchats_suggest>off</groupchats_suggest>
+    <encryption>on</encryption>
+    <https_storage>off</https_storage>
+    <https_force>off</https_force>
+    <compression>off</compression>
+    <analytics_track>off</analytics_track>
+    <analytics_url></analytics_url>
+    <analytics_id></analytics_id>
+    <ads_enable>off</ads_enable>
+    <ads_standard></ads_standard>
+    <ads_content></ads_content>
+    <gads_client></gads_client>
+    <gads_slot></gads_slot>
+    <multi_files>off</multi_files>
+    <developer>off</developer>
+    <statistics>off</statistics>
+    <register_api>off</register_api>
+    <xmppd_ctl>/usr/bin/metronomectl</xmppd_ctl>
+    <xmppd>metronome</xmppd>
 </jappix>
diff --git a/conf/nginx.conf b/conf/nginx.conf
index f5ae612..23174fc 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,5 +1,5 @@
 location PATHTOCHANGE/ {
-  alias ALIASTOCHANGE/ ;
+  alias ALIASTOCHANGE ;
   if ($scheme = http) {
     rewrite ^ https://$server_name$request_uri? permanent;
   }