X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=TLD_Builder%2Fconfig.py;h=2e86325f014ef6454a5a848694443fd20b9e52bb;hb=48833779774941e1ee019bf95395a8f67e414c52;hp=5e3bd9e106786427e97623bebedba60646ce9384;hpb=b999f53d4bf5d44586ecf028876e8bc20b5fd2ce;p=tld-builder.git diff --git a/TLD_Builder/config.py b/TLD_Builder/config.py index 5e3bd9e..2e86325 100644 --- a/TLD_Builder/config.py +++ b/TLD_Builder/config.py @@ -9,6 +9,7 @@ import path import log import status +import ssl syslog_facilities = { 'kern': syslog.LOG_KERN, @@ -72,10 +73,10 @@ 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("port", d=1234, sec="request-server")) + self.request_handler_server_port = int(get("port", d=1231, 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_port = int(get("ssl_port", d=1241, 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", "") @@ -122,6 +123,12 @@ class Builder_Conf: config = Builder_Conf() def init_conf(builder=None): + try: + _create_unverified_https_context = ssl._create_unverified_context + except AttributeError: + pass + else: + ssl._create_default_https_context = _create_unverified_https_context os.environ['LC_ALL'] = "C" status.push("reading builder config") log.builder = builder