commit 2d820f8041cd0a0adf1b4d7c191e2adbbe6d6464
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Nov 10 16:30:17 2014 +0100
Use system cacerts.
PLD_Builder/config.py | 1 -
PLD_Builder/request_handler_server.py | 2 +-
config/builder.conf.dist | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index 84d6d7b..2fcfe60 100644
--- 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 810fa7e..00e205d 100644
--- 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 3c5638f..16612c8 100644
--- 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:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/2d820f8041cd0a0adf1b4d7c191e2adbbe6d6464
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
