Externalise makebuildserver config variables

diff --git a/.gitignore b/.gitignore
index b2ac65496662ea89fa09cf06930df4f72564f0fe..10375a31df8d328bad1d016a3835459c6602a71d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 config.py
+makebs.config.py
 *~
 *.pyc
 buildserver.box

diff --git a/makebs.config.sample.py b/makebs.config.sample.py
new file mode 100644 (file)
index 0000000..5969e20
--- /dev/null
+++ b/makebs.config.sample.py
@@ -0,0 +1,16 @@
+# You will need to alter these before running makebuildserver.py
+
+# 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

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.