- revert CSS changes, they make status page barely readable

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

diff --git a/TLD_Builder/request_handler_server.py b/TLD_Builder/request_handler_server.py
index c2703f27f6b9a066a1e46af14e4a5b92786d843e..0a929507318041c1aa299ef5f4fca82000e1273a 100644 (file)
--- a/TLD_Builder/request_handler_server.py
+++ b/TLD_Builder/request_handler_server.py
@@ -2,7 +2,6 @@
 
 import socket
 import string
-import cgi
 import time
 import log
 import ssl
@@ -66,24 +65,8 @@ def write_css():
     r.close()
     os.umask(old_umask)
 
-def write_js():
-    js_src = os.path.join(os.path.dirname(__file__), 'script.js')
-    js_file = path.www_dir + '/script.js'
-    # skip if file exists and code is not newer
-    if os.path.exists(js_file) and os.stat(js_src).st_mtime < os.stat(js_file).st_mtime:
-        return
-
-    old_umask = os.umask(0o0022)
-    r = open(js_src, 'r')
-    f = open(js_file, 'w')
-    f.write(r.read())
-    f.close()
-    r.close()
-    os.umask(old_umask)
-
 def main(srv_ssl=False):
     write_css();
-    write_js();
     socket.setdefaulttimeout(30)
     try:
         init_conf()
@@ -95,11 +78,11 @@ def main(srv_ssl=False):
         try:
             server = ThreadingHTTPServer((host, port), MyHandler)
             if srv_ssl:
-                server.socket = ssl.wrap_socket (server.socket,
-                                keyfile = path.conf_dir + "/" + config.request_handler_server_ssl_key,
-                                certfile = path.conf_dir + "/" + config.request_handler_server_ssl_cert,
-                                ca_certs = "/etc/certs/ca-certificates.crt",
-                                server_side=True)
+                context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+                context.load_cert_chain(certfile=path.conf_dir + "/" + config.request_handler_server_ssl_cert,
+                                        keyfile=path.conf_dir + "/" + config.request_handler_server_ssl_key)
+                context.load_verify_locations(cafile="/etc/certs/ca-certificates.crt")
+                server.socket = context.wrap_socket(server.socket, server_side=True)
         except Exception as e:
             log.notice("request_handler_server: can't start server on [%s:%d], ssl=%s: %s" % (host, port, str(srv_ssl), e))
             print >> sys.stderr, "ERROR: Can't start server on [%s:%d], ssl=%s: %s" % (host, port, str(srv_ssl), e)