makebuildserver: set default Debian mirror to http.debian.net

This host automatically detects which is the closest mirror, then uses that
one.  It does so dynamically, so it'll work on machines that move too. Now
that we are pushing more people to run F-Droid build servers, the defaults
should take those use cases into account.

diff --git a/examples/makebuildserver.config.py b/examples/makebuildserver.config.py
index 615029b34a742777bf448b180f4c19e27950bc9e..f2c846d5e23cd45d91930f2044b5e218430a80bd 100644 (file)
--- a/examples/makebuildserver.config.py
+++ b/examples/makebuildserver.config.py
@@ -13,6 +13,12 @@ baseboxurl = "https://f-droid.org/jessie32.box"
 # or if you have a cached local copy, you can use that first:
 # baseboxurl = ["file:///home/fdroid/fdroidserver/cache/jessie32.box", "https://f-droid.org/jessie32.box"]
 
+# To specify which Debian mirror the build server VM should use, by
+# default it uses http.debian.net, which auto-detects which is the
+# best mirror to use.
+#
+# debian_mirror = 'http://ftp.uk.debian.org/debian/'
+
 # The amount of RAM the build server will have
 memory = 3584
 

diff --git a/makebuildserver b/makebuildserver
index 9695ba2c0e6b7a8c2d23236646dc50592522d856..4fc9a28dbd8816584c658d9f426cc3226c4b43b9 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -41,7 +41,7 @@ parser.add_option("-v", "--verbose", action="store_true", default=False,
                   help="Spew out even more information than normal")
 parser.add_option("-c", "--clean", action="store_true", default=False,
                   help="Build from scratch, rather than attempting to update the existing server")
-parser.add_option("--debian-mirror", default="http://ftp.uk.debian.org/debian/",
+parser.add_option("--debian-mirror", default="http://http.debian.net/debian/",
                   help="Use the specified Debian mirror in the box's /etc/apt/sources.list.")
 options, args = parser.parse_args()