- PLD merge, fully (re)TLDized

[tld-builder.git] / TLD_Builder / config.py

diff --git a/PLD_Builder/config.py b/TLD_Builder/config.py
similarity index 83%
rename from PLD_Builder/config.py
rename to TLD_Builder/config.py
index 2e78cd870c556829eac05e463d282a3d16d45e3c..5e3bd9e106786427e97623bebedba60646ce9384 100644 (file)
--- a/PLD_Builder/config.py
+++ b/TLD_Builder/config.py
@@ -37,8 +37,10 @@ class Builder_Conf:
 
     def read(self, builder):
         p = ConfigParser.ConfigParser()
-        def get(o, d = None):
-            if p.has_option(builder, o):
+        def get(o, d = None, sec=None):
+            if p.has_option(sec, o):
+                return string.strip(p.get(sec, o))
+            elif p.has_option(builder, o):
                 return string.strip(p.get(builder, o))
             elif p.has_option("all", o):
                 return string.strip(p.get("all", o))
@@ -70,7 +72,12 @@ class Builder_Conf:
         self.max_keep_time = int(get("max_keep_time", 168))*60*60
         self.bot_email = get("bot_email", "")
         self.control_url = get("control_url")
-        self.request_handler_server_port = int(get("request_handler_server_port", 1234))
+        self.request_handler_server_port = int(get("port", d=1234, sec="request-server"))
+        self.request_handler_server_ssl = get("ssl", d="False", sec="request-server")
+        if self.request_handler_server_ssl:
+            self.request_handler_server_ssl_port = int(get("port", d=1235, sec="request-server"))
+            self.request_handler_server_ssl_key = get("ssl_key", d="", sec="request-server")
+            self.request_handler_server_ssl_cert = get("ssl_cert", d="", sec="request-server")
         self.builder_list = get("builder_list", "")
         self.gen_upinfo = get("gen_upinfo", "yes")
         if self.gen_upinfo == 'no':
@@ -90,6 +97,7 @@ class Builder_Conf:
         self.arch = get("arch")
         self.chroot = get("chroot")
         self.buildlogs_url = get("buildlogs_url", "/dev/null")
+        self.buildlogs = get("buildlogs", "http://buildlogs.tld-linux.org/")
         self.ftp_url = get("ftp_url")
         self.notify_url = get("notify_url")
         self.test_ftp_url = get("test_ftp_url", "/dev/null")