Merge pull request #80 from sigourney/master

changed client to reflect new DNS name structure
FAForever · Oct 14, 2014 · 404eef3 · 404eef3
2 parents 70a6f83 + 0016203
commit 404eef3
Show file tree

Hide file tree

Showing 32 changed files with 59 additions and 59 deletions.
diff --git a/src/_res/coop/formatters/ladder.qthtml b/src/_res/coop/formatters/ladder.qthtml
@@ -4,5 +4,5 @@
 	<td class="login">{players}</td>
 	<td class="login" align="center">{objectives}</td>
 	<td class="rating">{timing}</td>
-	<td class="login"><a href="http://direct.faforever.com/faf/vault/replay_vault/replay.php?id={gameuid}">{gameuid}</a></td>
+	<td class="login"><a href="http://content.faforever.com/faf/vault/replay_vault/replay.php?id={gameuid}">{gameuid}</a></td>
 </tr>
diff --git a/src/_res/fa/updater/failure.ui b/src/_res/fa/updater/failure.ui
@@ -130,7 +130,7 @@ p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;Sorry, Forged Alliance Forever couldn't complete the upgrade!&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; font-weight:600;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Forged Alliance Forever could not be successfully updated at this time. This is a log of the installation process. You may post it to the &lt;/span&gt;&lt;a href=&quot;http://www.faforever.com/forums/viewforum.php?f=3&amp;amp;start=0&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;tech support forum&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; should you want to report an issue with this installer.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Forged Alliance Forever could not be successfully updated at this time. This is a log of the installation process. You may post it to the &lt;/span&gt;&lt;a href=&quot;http://forums.faforever.com/forums/viewforum.php?f=3&amp;amp;start=0&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;tech support forum&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; should you want to report an issue with this installer.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="textInteractionFlags">
     <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>

diff --git a/src/_res/fa/updater/illegal.ui b/src/_res/fa/updater/illegal.ui
@@ -97,7 +97,7 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;A fresh install of Supreme Commander: Forged Alliance is recommended before patching &amp;amp; upgrading. You can also register your CD-Key on Steam to download an up to date version without needing a disk.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Visit the Forged Alliance Forever &lt;/span&gt;&lt;a href=&quot;http://www.faforever.com/forums/viewforum.php?f=3&amp;amp;start=0&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;tech support forum&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; if you have questions.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Visit the Forged Alliance Forever &lt;/span&gt;&lt;a href=&quot;http://forums.faforever.com/forums/viewforum.php?f=3&amp;amp;start=0&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#0000ff;&quot;&gt;tech support forum&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt; if you have questions.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="textInteractionFlags">
     <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>

diff --git a/src/_res/tutorials/tutorials.ui b/src/_res/tutorials/tutorials.ui
@@ -58,10 +58,10 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;You can also gather more help here : &lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.faforever.com/forums/viewtopic.php?f=2&amp;amp;t=537&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600; text-decoration: underline; color:#55aaff;&quot;&gt;Help me I'm new !&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://forums.faforever.com/forums/viewtopic.php?f=2&amp;amp;t=537&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600; text-decoration: underline; color:#55aaff;&quot;&gt;Help me I'm new !&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt; color:#55aaff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt;and here :&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://www.faforever.com/forums/viewtopic.php?f=2&amp;amp;t=1614&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600; text-decoration: underline; color:#55aaff;&quot;&gt;Your Personal Trainer Team&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://forums.faforever.com/forums/viewtopic.php?f=2&amp;amp;t=1614&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600; text-decoration: underline; color:#55aaff;&quot;&gt;Your Personal Trainer Team&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
       <property name="openExternalLinks">
        <bool>true</bool>

diff --git a/src/aip/faforever.aip b/src/aip/faforever.aip
@@ -4,7 +4,7 @@
     <ROW Property="ALLUSERS" Value="2"/>
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPCONTACT" Value="[email protected]"/>
-    <ROW Property="ARPHELPLINK" Value="http://www.faforever.com/forums/viewforum.php?f=3"/>
+    <ROW Property="ARPHELPLINK" Value="http://forums.faforever.com/forums/viewforum.php?f=3"/>
     <ROW Property="ARPPRODUCTICON" Value="faf.exe" Type="8"/>
     <ROW Property="ARPURLINFOABOUT" Value="http://www.faforever.com"/>
     <ROW Property="ARPURLUPDATEINFO" Value="http://www.faforever.com/page=2"/>

diff --git a/src/build.dat b/src/build.dat
@@ -1 +1 @@
-121
+122
diff --git a/src/chat/_chatwidget.py b/src/chat/_chatwidget.py
@@ -33,7 +33,7 @@
 import notificatation_system as ns
 
 IRC_PORT = 8167
-IRC_SERVER = "direct.faforever.com"
+IRC_SERVER = "irc.faforever.com"
 POLLING_INTERVAL = 300   # milliseconds between irc polls
 PONG_INTERVAL = 100000   # milliseconds between pongs
 

diff --git a/src/client/__init__.py b/src/client/__init__.py
@@ -36,20 +36,20 @@
 
 
 # Initialize all important globals
-LOBBY_HOST = 'direct.faforever.com'
+LOBBY_HOST = 'lobby.faforever.com'
 LOBBY_PORT = 8001
 LOCAL_REPLAY_PORT = 15000
 GAME_PORT_DEFAULT = 6112
 
 # Important URLs
-MUMBLE_URL = "mumble://{login}@faforever.com/Games?version=1.2.0" 
-FORUMS_URL = "http://faforever.com/forums"
+MUMBLE_URL = "mumble://{login}@mumble.faforever.com/Games?version=1.2.0" 
+FORUMS_URL = "http://forums.faforever.com/forums"
 WEBSITE_URL = "http://www.faforever.com"
-UNITDB_URL = "http://www.faforever.com/faf/unitsDB/"
-WIKI_URL = "http://www.faforever.com/mediawiki/index.php/Main_Page"
-SUPPORT_URL = "http://www.faforever.com/forums/viewforum.php?f=3"
-TICKET_URL = "http://www.faforever.com/forums/viewforum.php?f=3"
-STEAMLINK_URL = "http://www.faforever.com/faf/steam.php"
+UNITDB_URL = "http://content.faforever.com/faf/unitsDB/"
+WIKI_URL = "http://wiki.faforever.com/mediawiki/index.php/Main_Page"
+SUPPORT_URL = "http://forums.faforever.com/forums/viewforum.php?f=3"
+TICKET_URL = "http://forums.faforever.com/forums/viewforum.php?f=3"
+STEAMLINK_URL = "http://app.faforever.com/faf/steam.php"
 
 
 class ClientState:

diff --git a/src/client/_clientwindow.py b/src/client/_clientwindow.py
@@ -1199,7 +1199,7 @@ def doLogin(self):
 
 
         if not self.uniqueId :
-            QtGui.QMessageBox.warning(QtGui.QApplication.activeWindow(), "Unable to login", "It seems that you miss some important DLL.<br>Please install :<br><a href =\"http://www.microsoft.com/download/en/confirmation.aspx?id=8328\">http://www.microsoft.com/download/en/confirmation.aspx?id=8328</a> and <a href = \"http://www.microsoft.com/en-us/download/details.aspx?id=17851\">http://www.microsoft.com/en-us/download/details.aspx?id=17851</a><br><br>You probably have to restart your computer after installing them.<br><br>Please visit this link in case of problems : <a href=\"http://www.faforever.com/forums/viewforum.php?f=3\">http://www.faforever.com/forums/viewforum.php?f=3</a>", QtGui.QMessageBox.Close)
+            QtGui.QMessageBox.warning(QtGui.QApplication.activeWindow(), "Unable to login", "It seems that you miss some important DLL.<br>Please install :<br><a href =\"http://www.microsoft.com/download/en/confirmation.aspx?id=8328\">http://www.microsoft.com/download/en/confirmation.aspx?id=8328</a> and <a href = \"http://www.microsoft.com/en-us/download/details.aspx?id=17851\">http://www.microsoft.com/en-us/download/details.aspx?id=17851</a><br><br>You probably have to restart your computer after installing them.<br><br>Please visit this link in case of problems : <a href=\"http://forums.faforever.com/forums/viewforum.php?f=3\">http://forums.faforever.com/forums/viewforum.php?f=3</a>", QtGui.QMessageBox.Close)
             return False
         else :
             self.send(dict(command="hello", version=util.VERSION, login=self.login, password=self.password, unique_id=self.uniqueId, local_ip=self.localIP))

diff --git a/src/client/loginwizards.py b/src/client/loginwizards.py
@@ -28,9 +28,9 @@
 import hashlib
 from client import ClientState, logger
 
-PASSWORD_RECOVERY_URL = "http://www.faforever.com/faf/forgotPass.php"
-NAME_CHANGE_URL = "http://www.faforever.com/faf/userName.php"
-STEAM_LINK_URL = "http://www.faforever.com/faf/steam.php"
+PASSWORD_RECOVERY_URL = "http://app.faforever.com/faf/forgotPass.php"
+NAME_CHANGE_URL = "http://app.faforever.com/faf/userName.php"
+STEAM_LINK_URL = "http://app.faforever.com/faf/steam.php"
 
 class LoginWizard(QtGui.QWizard):
     def __init__(self, client):
@@ -394,7 +394,7 @@ def __init__(self, parent=None):
         self.setPixmap(QtGui.QWizard.WatermarkPixmap, util.pixmap("client/settings_watermark.png"))
 
         self.label = QtGui.QLabel()
-        self.label.setText('Forged Alliance needs an open UDP port to play. If you have trouble connecting to other players, try the UPnP option first. If that fails, you should try to open or forward the port on your router and firewall.<br/><br/>Visit the <a href="http://www.faforever.com/forums/viewforum.php?f=3">Tech Support Forum</a> if you need help.<br/><br/>')
+        self.label.setText('Forged Alliance needs an open UDP port to play. If you have trouble connecting to other players, try the UPnP option first. If that fails, you should try to open or forward the port on your router and firewall.<br/><br/>Visit the <a href="http://forums.faforever.com/forums/viewforum.php?f=3">Tech Support Forum</a> if you need help.<br/><br/>')
         self.label.setOpenExternalLinks(True)
         self.label.setWordWrap(True)
 

diff --git a/src/downloadManager/__init__.py b/src/downloadManager/__init__.py
@@ -27,7 +27,7 @@
 logger= logging.getLogger("faf.downloader")
 logger.setLevel(logging.DEBUG)
 
-VAULT_PREVIEW_ROOT = "http://www.faforever.com/faf/vault/map_previews/small/"
+VAULT_PREVIEW_ROOT = "http://content.faforever.com/faf/vault/map_previews/small/"
 
 class downloadManager(QtCore.QObject):
     ''' This class allows downloading stuff in the background'''

diff --git a/src/fa/__init__.py b/src/fa/__init__.py
@@ -28,7 +28,7 @@
 logger= logging.getLogger("faf.fa")
 logger.setLevel(logging.INFO)
 
-GPGNET_HOST = "faforever.com"
+GPGNET_HOST = "lobby.faforever.com"
 GPGNET_PORT = 8000
 
 
@@ -105,4 +105,4 @@ def writeFAPathLua():
 import updater
 import upnp
 import gwreplayinfo
-import gwgametable
+import gwgametable
diff --git a/src/fa/gwreplayinfo.py b/src/fa/gwreplayinfo.py
@@ -49,7 +49,7 @@ class GWReplayInfo(QtCore.QObject):
     '''
     # Network configuration
     SOCKET  = 11002
-    HOST    = "faforever.com"
+    HOST    = "lobby.faforever.com"
     TIMEOUT = 20  #seconds
 
     # Return codes to expect from run()
@@ -224,4 +224,4 @@ def disconnected(self):
     @QtCore.pyqtSlot(QtNetwork.QAbstractSocket.SocketError)
     def errored(self, error):
         self.result = self.RESULT_FAILURE
-
+
diff --git a/src/fa/maps.py b/src/fa/maps.py
@@ -48,9 +48,9 @@
 import re
 
 
-VAULT_PREVIEW_ROOT = "http://www.faforever.com/faf/vault/map_previews/small/" 
-VAULT_DOWNLOAD_ROOT = "http://www.faforever.com/faf/vault/"
-VAULT_COUNTER_ROOT = "http://www.faforever.com/faf/vault/map_vault/inc_downloads.php"
+VAULT_PREVIEW_ROOT = "http://content.faforever.com/faf/vault/map_previews/small/" 
+VAULT_DOWNLOAD_ROOT = "http://content.faforever.com/faf/vault/"
+VAULT_COUNTER_ROOT = "http://content.faforever.com/faf/vault/map_vault/inc_downloads.php"
 
 
 maps = { # A Lookup table for info (names, sizes, players) of the official Forged Alliance Maps
@@ -692,4 +692,4 @@ def processMapFolderForUpload(mapDir, positions):
 
     temp.flush()
 
-    return temp
+    return temp
diff --git a/src/fa/proxies.py b/src/fa/proxies.py
@@ -26,7 +26,7 @@
 
 import logging
 
-FAF_PROXY_HOST = "direct.faforever.com"
+FAF_PROXY_HOST = "proxy.faforever.com"
 FAF_PROXY_PORT = 9124
 
 UNIT16 = 8
@@ -248,4 +248,4 @@ def disconnectedFromProxy(self):
         if self.canClose == False:
             self.__logger.info("reconnecting to proxy server")
             self.connectToProxy()
-
+
diff --git a/src/fa/relayserver.py b/src/fa/relayserver.py
@@ -32,7 +32,7 @@
 import struct
 
 
-FAF_SERVER_HOST = "direct.faforever.com"
+FAF_SERVER_HOST = "lobby.faforever.com"
 #FAF_SERVER_HOST = "localhost"
 FAF_SERVER_PORT = 8000
 

diff --git a/src/fa/replayserver.py b/src/fa/replayserver.py
@@ -29,7 +29,7 @@
 import json
 import time
 
-INTERNET_REPLAY_SERVER_HOST = "faforever.com"
+INTERNET_REPLAY_SERVER_HOST = "lobby.faforever.com"
 INTERNET_REPLAY_SERVER_PORT = 15000
 
 

diff --git a/src/fa/updater.py b/src/fa/updater.py
@@ -325,7 +325,7 @@ class Updater(QtCore.QObject):
     '''
     # Network configuration
     SOCKET  = 9001
-    HOST    = "direct.faforever.com"
+    HOST    = "lobby.faforever.com"
     TIMEOUT = 20  #seconds
 
     # Return codes to expect from run()

diff --git a/src/featuredmods/_featuredmod.py b/src/featuredmods/_featuredmod.py
@@ -77,7 +77,7 @@ def ftpCommandFinished(self, _, error):
         if self.ftp.currentCommand() == QtNetwork.QFtp.ConnectToHost:
             if error:
                 QtGui.QMessageBox.information(self, "FTP",
-                        "Unable to connect to the FTP server at faforever.com. ")
+                        "Unable to connect to the FTP server at lobby.faforever.com. ")
                 logger.warn("Cannot connect to FTP")
                 self.ftp.abort()       
                 self.ftp.close()
@@ -167,7 +167,7 @@ def addVersionFile(self):
                 if fileName:
 
                     self.fileToUpload = QtCore.QFile(fileName)
-                    self.ftp.connectToHost("faforever.com", 1980)
+                    self.ftp.connectToHost("lobby.faforever.com", 1980)
                     logger.debug("Connecting to FTP")
                     self.ftp.login(self.currentMod, self.password)
                     logger.debug("Logging to FTP")
@@ -278,4 +278,4 @@ def manageMod(self, mod):
             self.password = text        
 
             # asking for mod info
-            self.client.send(dict(command="mod_manager_info", action="list", mod=self.currentMod))
+            self.client.send(dict(command="mod_manager_info", action="list", mod=self.currentMod))
diff --git a/src/galacticWar/__init__.py b/src/galacticWar/__init__.py
@@ -24,10 +24,10 @@
 logger = logging.getLogger("faf.galacticWar")
 logger.setLevel(logging.DEBUG)
 
-LOBBY_HOST = 'direct.faforever.com'
+LOBBY_HOST = 'lobby.faforever.com'
 LOBBY_PORT = 10001
 
-TEXTURE_SERVER = "http://direct.faforever.com/faf/images/"
+TEXTURE_SERVER = "http://content.faforever.com/faf/images/"
 
 RANKS = {0:["Private", "Corporal", "Sergeant", "Captain", "Major", "Colonel", "General", "Supreme Commander"],
          1:["Paladin", "Legate", "Priest", "Centurion", "Crusader", "Evaluator", "Avatar-of-War", "Champion"],
@@ -41,4 +41,4 @@
 from _gwlobby import LobbyWidget as Lobby
 
 
-
+
diff --git a/src/games/gameitem.py b/src/games/gameitem.py
@@ -132,15 +132,15 @@ def url(self, player = None):
         if self.state == "playing":
             url = QtCore.QUrl()
             url.setScheme("faflive")
-            url.setHost("faforever.com")
+            url.setHost("lobby.faforever.com")
             url.setPath(str(self.uid) + "/" + player + ".SCFAreplay")
             url.addQueryItem("map", self.mapname)
             url.addQueryItem("mod", self.mod)
             return url
         elif self.state == "open":
             url = QtCore.QUrl()
             url.setScheme("fafgame")
-            url.setHost("faforever.com")
+            url.setHost("lobby.faforever.com")
             url.setPath(self.host)
             url.addQueryItem("map", self.mapname)
             url.addQueryItem("mod", self.mod)

diff --git a/src/modvault/utils.py b/src/modvault/utils.py
@@ -37,7 +37,7 @@
 logger.setLevel(logging.DEBUG)
 
 MODFOLDER = os.path.join(util.PERSONAL_DIR, "My Games", "Gas Powered Games", "Supreme Commander Forged Alliance", "Mods")
-MODVAULT_DOWNLOAD_ROOT = "http://www.faforever.com/faf/vault/"
+MODVAULT_DOWNLOAD_ROOT = "http://content.faforever.com/faf/vault/"
 
 installedMods = [] # This is a global list that should be kept intact. So it should be cleared using installedMods[:] = []
 

diff --git a/src/mumbleconnector/_mumbleconnector.py b/src/mumbleconnector/_mumbleconnector.py
@@ -22,7 +22,7 @@
 
 class mumbleConnector():
 
-    mumbleHost = "faforever.com"
+    mumbleHost = "mumble.faforever.com"
     mumbleChannelRoot = "Games"
     mumbleLinkActive = None
     pluginName = "faforever"