diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2007-10-03 15:49:47 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-10-03 15:49:47 -0400 |
| commit | 7ce5ca845806274e307d600d506c19a8b31973e4 (patch) | |
| tree | b8a0ef743c1bddaab3926c36137c1beea008db61 | |
| parent | c88e8710546a2f3fc7a2503feba4300dacbdda03 (diff) | |
| download | func-7ce5ca845806274e307d600d506c19a8b31973e4.tar.gz func-7ce5ca845806274e307d600d506c19a8b31973e4.tar.xz func-7ce5ca845806274e307d600d506c19a8b31973e4.zip | |
get rid of listen_port option since we really don't want that to be an option
right now anyway
| -rw-r--r-- | etc/certmaster.conf | 1 | ||||
| -rwxr-xr-x | func/certmaster.py | 4 | ||||
| -rw-r--r-- | func/commonconfig.py | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/certmaster.conf b/etc/certmaster.conf index ded4de6..71b2068 100644 --- a/etc/certmaster.conf +++ b/etc/certmaster.conf @@ -1,6 +1,5 @@ [main] listen_addr = -listen_port = 51235 cadir = /etc/pki/func/ca certroot = /var/lib/func/certmaster/certs csrroot = /var/lib/func/certmaster/csrs diff --git a/func/certmaster.py b/func/certmaster.py index e881b3e..e8c046d 100755 --- a/func/certmaster.py +++ b/func/certmaster.py @@ -33,6 +33,8 @@ import utils from config import read_config from commonconfig import CMConfig +CERTMASTER_LISTEN_PORT = 51235 + class CertMaster(object): def __init__(self, conf_file): self.cfg = read_config(conf_file, CMConfig) @@ -203,7 +205,7 @@ def serve(xmlrpcinstance): Code for starting the XMLRPC service. """ - server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, xmlrpcinstance.cfg.listen_port)) + server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, CERTMASTER_LISTEN_PORT)) server.logRequests = 0 # don't print stuff to console server.register_instance(xmlrpcinstance) server.serve_forever() diff --git a/func/commonconfig.py b/func/commonconfig.py index 559c290..cbf031e 100644 --- a/func/commonconfig.py +++ b/func/commonconfig.py @@ -4,7 +4,6 @@ from config import BaseConfig, BoolOption, IntOption, Option class CMConfig(BaseConfig): listen_addr = Option('') - listen_port = IntOption(51235) cadir = Option('/etc/pki/func/ca') certroot = Option('/var/lib/func/certmaster/certs') csrroot = Option('/var/lib/func/certmaster/csrs') |