1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-04 16:30:12 +02:00

makebuildserver: set defaults in script so it can run without config

This makes it so that ./makebuildserver will run without any config file,
using the defaults that are embedded in the script itself.  This is like
how `fdroid` works.
This commit is contained in:
Hans-Christoph Steiner 2016-01-20 21:00:16 +01:00
parent 50713c7ce9
commit 3bd8ef2c8c
2 changed files with 16 additions and 8 deletions

View File

@ -3,13 +3,14 @@
# You may want to alter these before running ./makebuildserver
# Name of the base box to use
basebox = "jessie32"
# basebox = "jessie32"
# Location where testing32.box can be found, if you don't already have
# it. For security reasons, it's recommended that you make your own
# in a secure environment using trusted media (see the manual) but
# you can use this default if you like...
baseboxurl = "https://f-droid.org/jessie32.box"
# 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"]
@ -20,13 +21,13 @@ baseboxurl = "https://f-droid.org/jessie32.box"
# debian_mirror = 'http://ftp.uk.debian.org/debian/'
# The amount of RAM the build server will have
memory = 3584
# memory = 3584
# The number of CPUs the build server will have
cpus = 1
# cpus = 1
# Debian package proxy server - if you have one, e.g. "http://192.168.0.19:8000"
aptproxy = None
# Debian package proxy server - if you have one
# aptproxy = "http://192.168.0.19:8000"
# Set to True if your base box is 64 bit (e.g. testing32.box isn't)
arch64 = False
# arch64 = True

View File

@ -45,7 +45,14 @@ 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()
config = {}
# set up default config
config = {
'arch64': False,
'basebox': 'jessie32',
'baseboxurl': 'https://f-droid.org/jessie32.box',
'cpus': 1,
'memory': 3584,
}
# load config file, if present
if os.path.exists('makebuildserver.config.py'):