Externalise makebuildserver config variables

[fdroidserver.git] / makebuildserver.py

diff --git a/makebuildserver.py b/makebuildserver.py
index b47a8c11743736faab6985630faef5e224a14fb5..a1c44011758c84b3a6a43ea93aa259503e23564d 100755 (executable)
--- a/makebuildserver.py
+++ b/makebuildserver.py
@@ -5,23 +5,7 @@ import sys
 import subprocess
 import time
 
-
-# Settings, which need to be moved elsewhere ultimately. You will need
-# to alter these before running.
-
-# Name of the base box to use...
-basebox = "raring32"
-# Location where raring32.box can be found, if you don't already have
-# it. Could be set to https://f-droid.org/raring32.box if you like...
-baseboxurl = "/shares/software/OS and Boot/raring32.box"
-memory = 3584
-# Debian package proxy server - set this to None unless you have one...
-aptproxy = "http://192.168.0.19:8000"
-# Set to True if your base box is 64 bit...
-arch64 = False
-
-# End of settings.
-
+execfile('makebs.config.py', globals())
 
 def vagrant(params, cwd=None, printout=False):
     """Run vagrant.