Remove the conf JID, and have everything under the main one.

ZeWaren · Mar 6, 2016 · 8d1845d · 8d1845d
1 parent a8be28f
commit 8d1845d
Show file tree

Hide file tree

Showing 5 changed files with 218 additions and 249 deletions.
diff --git a/README.md b/README.md
@@ -92,8 +92,6 @@ Please look at the comments in the provided example config file for information
     hosts:
       "hangups.example.net":
         password: "secret"
-      "conf.hangups.example.net":
-        password: "secret"
 </pre>
 
 ### Startup

diff --git a/__main__.py b/__main__.py
@@ -104,7 +104,7 @@ def sig_handler(signum, frame):
     connection = xmpp.client.Component(config.jid,
                                        config.port,
                                        debug=[],
-                                       domains=[config.jid, config.confjid],
+                                       domains=[config.jid],
                                        sasl=sasl,
                                        bind=config.useComponentBinding,
                                        route=config.useRouteWrap)

diff --git a/config.py b/config.py
@@ -4,7 +4,6 @@
 pidFile = ""
 
 jid = "hangups.example.net"
-confjid = "conf.hangups.example.net"
 discoName = "Hangouts Transport"
 
 mainServer = "127.0.0.1"

diff --git a/config.xml b/config.xml
@@ -6,9 +6,6 @@
     <!-- The JabberID of the transport -->
     <jid>hangups.example.net</jid>
 
-    <!-- The conference JabberID of the transport -->
-    <confjid>conf.hangups.example.net</confjid>
-
     <!-- The name of the transport in the service discovery list. -->
     <discoName>Google Hangouts Transport</discoName>