Change default hub to pakfirehub.ipfire.org.

diff --git a/examples/client.conf b/examples/client.conf
index da57d03fd79cbb754e33fd1e741eba1114d928c8..6c59de98cceb9f62858f873e9ce522a3477a32c0 100644 (file)
--- a/examples/client.conf
+++ b/examples/client.conf
@@ -3,7 +3,7 @@
 [client]
 
 # The URL of the server to connect to.
-# server = https://pakfire.ipfire.org/
+# server = https://pakfirehub.ipfire.org/
 
 # Your credentials to log in on the hub.
 # username = ipfire

diff --git a/examples/daemon.conf b/examples/daemon.conf
index 525cc1f361d264e53ee4360fe9de427fc712f00f..143a7f6d5b6481a65f52fc8561959bf7a13e48b3 100644 (file)
--- a/examples/daemon.conf
+++ b/examples/daemon.conf
@@ -3,7 +3,7 @@
 [daemon]
 
 # The URL of the server to connect to.
-# server = https://pakfire.ipfire.org/
+# server = https://pakfirehub.ipfire.org/
 
 # The hostname of this machine.
 # hostname = <automatically detected>

diff --git a/python/pakfire/client/base.py b/python/pakfire/client/base.py
index 1886e2b4baf40fcc3cba36f1fd9bee63c3af8860..3ac4bef5f75758b3e44cf7c5895aabae52101564 100644 (file)
--- a/python/pakfire/client/base.py
+++ b/python/pakfire/client/base.py
@@ -51,7 +51,7 @@ class PakfireClient(object):
                        ret += "%s:%s@" % (username, password)
 
                # Add host and path components.
-               ret += "%s/pakfirehub/%s" % (url.netloc, self.type)
+               ret += "/".join((url.netloc, self.type))
 
                return ret
 

diff --git a/python/pakfire/config.py b/python/pakfire/config.py
index c7ab14301459323a8080fef494e643e91120a14d..0d3278424c91c88d45ae049a4c74d90ad83ed5cd 100644 (file)
--- a/python/pakfire/config.py
+++ b/python/pakfire/config.py
@@ -237,7 +237,7 @@ class ConfigClient(_Config):
                "client" : {
                        # The default server is the official Pakfire
                        # server.
-                       "server"   : "https://pakfire.ipfire.org",
+                       "server"   : PAKFIRE_HUB,
                },
        }
 
@@ -249,7 +249,7 @@ class ConfigDaemon(_Config):
                "daemon" : {
                        # The default server is the official Pakfire
                        # server.
-                       "server"   : "https://pakfire.ipfire.org",
+                       "server"   : PAKFIRE_HUB,
 
                        # The default hostname is the host name of this
                        # machine.

diff --git a/python/pakfire/constants.py b/python/pakfire/constants.py
index 2998ab7fde4a7e259c525ff05c68c9e1d6528be7..2c091e42f9f8ff4de6dd41af3df88c7273eaf8dc 100644 (file)
--- a/python/pakfire/constants.py
+++ b/python/pakfire/constants.py
@@ -27,6 +27,9 @@ from __version__ import PAKFIRE_VERSION
 
 PAKFIRE_LEAST_COMPATIBLE_VERSION = PAKFIRE_VERSION
 
+# The default hub to connect to.
+PAKFIRE_HUB = "https://pakfirehub.ipfire.org/"
+
 SYSCONFDIR = "/etc"
 SCRIPT_DIR = "/usr/lib/pakfire"