diff options
| author | Rob Austein <sra@hactrn.net> | 2010-10-07 00:59:39 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2010-10-07 00:59:39 +0000 |
| commit | 94bad6e5ca0045bb46093a3002e7c03ea6e0bee4 (patch) | |
| tree | b54b80610b8565a232167290010172cac6b0df2b /rpkid/rpkid.py | |
| parent | 8ada594d05c4e79fc2e3a13b50489bb75bd90cae (diff) | |
Merge rpkid.without_tls/ branch to rpkid/ trunk.
svn path=/rpkid/Makefile; revision=3465
Diffstat (limited to 'rpkid/rpkid.py')
| -rw-r--r-- | rpkid/rpkid.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/rpkid/rpkid.py b/rpkid/rpkid.py index da3c9f22..d5bccce6 100644 --- a/rpkid/rpkid.py +++ b/rpkid/rpkid.py @@ -9,7 +9,7 @@ Default configuration file is rpkid.conf, override with --config option. $Id$ -Copyright (C) 2009 Internet Systems Consortium ("ISC") +Copyright (C) 2009--2010 Internet Systems Consortium ("ISC") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -40,7 +40,7 @@ PERFORMANCE OF THIS SOFTWARE. import os, time, getopt, sys import rpki.resource_set, rpki.up_down, rpki.left_right, rpki.x509, rpki.sql -import rpki.https, rpki.config, rpki.exceptions, rpki.relaxng, rpki.log +import rpki.http, rpki.config, rpki.exceptions, rpki.relaxng, rpki.log import rpki.rpki_engine os.environ["TZ"] = "UTC" @@ -82,14 +82,12 @@ def main(): gctx.start_cron() - rpki.https.server(host = gctx.https_server_host, - port = gctx.https_server_port, - server_key = gctx.rpkid_key, - server_cert = gctx.rpkid_cert, - dynamic_https_trust_anchor = gctx.build_https_ta_cache, - handlers = (("/left-right", gctx.left_right_handler), - ("/up-down/", gctx.up_down_handler), - ("/cronjob", gctx.cronjob_handler))) + rpki.http.server( + host = gctx.http_server_host, + port = gctx.http_server_port, + handlers = (("/left-right", gctx.left_right_handler), + ("/up-down/", gctx.up_down_handler), + ("/cronjob", gctx.cronjob_handler))) if profile: import cProfile |