Added config to automatically always use build server

diff --git a/config.sample.py b/config.sample.py
index 3d652cbd0071440894c5ac8a5f18b754ea3a5c1c..695d337cb47472492a1d2787928375b80f9f7fa6 100644 (file)
--- a/config.sample.py
+++ b/config.sample.py
@@ -54,3 +54,8 @@ wiki_password = "1234"
 #machine.
 update_stats = False
 
+
+#Set this to true to always use a build server. This saves specifying the
+#--server option on dedicated secure build server hosts.
+build_server_always = False
+

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 587be4892f4b86636dd4585fb89876be19a6abd1..239b920ef4189252d12accf51d09b7badd428dde 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -451,10 +451,6 @@ def parse_commandline():
         print "Force is only allowed in test mode"
         sys.exit(1)
 
-    if options.resetserver and not options.server:
-        print "Using --resetserver without --server makes no sense"
-        sys.exit(1)
-
     return options, args
 
 options = None
@@ -463,8 +459,15 @@ def main():
 
     global options
     # Read configuration...
+    global build_server_always
+    build_server_always = False
     execfile('config.py', globals())
     options, args = parse_commandline()
+    if build_server_always:
+        options.server = True
+    if options.resetserver and not options.server:
+        print "Using --resetserver without --server makes no sense"
+        sys.exit(1)
 
     # Get all apps...
     apps = common.read_metadata(options.verbose)