Use system cacerts.

diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index 84d6d7b0ceb3e703219d54b9e9257fdaee2f3e7f..2fcfe60a4b5285ae037a6fc305a0b8fed09857fd 100644 (file)
--- a/PLD_Builder/config.py
+++ b/PLD_Builder/config.py
@@ -78,7 +78,6 @@ class Builder_Conf:
             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.request_handler_server_ssl_cacert = get("ssl_cacert", d="", sec="request-server")
         self.builder_list = get("builder_list", "")
         self.gen_upinfo = get("gen_upinfo", "yes")
         if self.gen_upinfo == 'no':

diff --git a/PLD_Builder/request_handler_server.py b/PLD_Builder/request_handler_server.py
index 810fa7e53ae20292fd8214fb148cb91c964b217d..00e205d05592a96848c18b901411c6b522b8f084 100644 (file)
--- a/PLD_Builder/request_handler_server.py
+++ b/PLD_Builder/request_handler_server.py
@@ -100,7 +100,7 @@ def main(srv_ssl=False):
                                server.socket = ssl.wrap_socket (server.socket,
                                                keyfile = config.request_handler_server_ssl_key,
                                                certfile = config.request_handler_server_ssl_cert,
-                                               ca_certs = config.request_handler_server_ssl_cacert,
+                                               ca_certs = "/etc/certs/ca-certificates.crt",
                                                server_side=True)
                except Exception, e:
                        log.notice("request_handler_server: can't start server on [%s:%d], ssl=%s: %s" % (host, port, str(srv_ssl), e))

diff --git a/config/builder.conf.dist b/config/builder.conf.dist
index 3c5638f06ad73013ec53d6b52fbae3d7f8d55d63..16612c893dde9fc2f6869c167ba6ce523fe57d3d 100644 (file)
--- a/config/builder.conf.dist
+++ b/config/builder.conf.dist
@@ -68,7 +68,6 @@ tag_prefixes = auto-th-
 ssl_port = 1235
 ssl_key = somewhere/srcbuilder.key
 ssl_cert = somewhere/srcbuilder.crt
-ssl_cacert = somewhere/intermediateca.crt
 
 # ------ Configs for particular builders: