From 50713c7ce96203e7297e16848919ca2009a21d85 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 20 Jan 2016 20:40:25 +0100 Subject: [PATCH] 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. --- examples/makebuildserver.config.py | 6 ++++++ makebuildserver | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/makebuildserver.config.py b/examples/makebuildserver.config.py index 615029b3..f2c846d5 100644 --- 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 9695ba2c..4fc9a28d 100755 --- 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()