From ceb4b20ede2ec36c0b6cb38660f9aa99840f4213 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 6 Jun 2013 11:33:44 +0200 Subject: [PATCH] Externalise makebuildserver config variables --- .gitignore | 1 + makebs.config.sample.py | 16 ++++++++++++++++ makebuildserver.py | 18 +----------------- 3 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 makebs.config.sample.py diff --git a/.gitignore b/.gitignore index b2ac6549..10375a31 100644 --- 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 index 00000000..5969e20b --- /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 b47a8c11..a1c44011 100755 --- 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. -- 2.30.2