makebuildserver: explicitly set debian_mirror by default

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index ca2dc56ff4c01d16893fa36beddc3de8fc286d47..d876a004a1db8d602226d8e71b2c498afd79902f 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -41,8 +41,6 @@ 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://http.debian.net/debian/",
-                  help="Use the specified Debian mirror in the box's /etc/apt/sources.list.")
 options, args = parser.parse_args()
 
 # set up default config
@@ -55,6 +53,7 @@ config = {
         'file://' + os.path.join(cachedir, 'jessie32.box'),
         'https://f-droid.org/jessie32.box',
     ],
+    'debian_mirror': 'http://http.debian.net/debian/',
     'cachedir': cachedir,
     'cpus': 1,
     'memory': 3584,
@@ -383,7 +382,7 @@ vagrantfile += """
     chef.add_recipe "kivy"
   end
 end
-""" % (options.debian_mirror)
+""" % (config['debian_mirror'])
 
 # Check against the existing Vagrantfile, and if they differ, we need to
 # create a new box: