summaryrefslogtreecommitdiffstats
path: root/certmaster/certmaster.py
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2008-11-12 11:53:59 -0500
committerAdrian Likins <alikins@redhat.com>2008-11-12 11:53:59 -0500
commit48b1e96d3c66a1a733ca573505e7203651142308 (patch)
tree2aa782ce0f1917f1616eb23dde2ad61a0fa1d35f /certmaster/certmaster.py
parent5bb4be3edcfdf031d7446e434ef4f51309ce32c7 (diff)
downloadcertmaster-48b1e96d3c66a1a733ca573505e7203651142308.tar.gz
certmaster-48b1e96d3c66a1a733ca573505e7203651142308.tar.xz
certmaster-48b1e96d3c66a1a733ca573505e7203651142308.zip
Make the port that certmaster listens on and funcd connects to configurable.
add listen_port to /etc/certmaster/certmaster.conf to configure which port certmaster runs on. add certmaster_port to /etc/certmaster/minion.conf so funcd knows which port to talk to certmaster on.
Diffstat (limited to 'certmaster/certmaster.py')
-rwxr-xr-xcertmaster/certmaster.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/certmaster/certmaster.py b/certmaster/certmaster.py
index aba3f7c..e3abf39 100755
--- a/certmaster/certmaster.py
+++ b/certmaster/certmaster.py
@@ -312,7 +312,12 @@ def serve(xmlrpcinstance):
"""
- server = CertmasterXMLRPCServer((xmlrpcinstance.cfg.listen_addr, CERTMASTER_LISTEN_PORT))
+ config = read_config(CERTMASTER_CONFIG, CMConfig)
+ listen_addr = config.listen_addr
+ listen_port = config.listen_port
+ if listen_port == '':
+ listen_port = CERTMASTER_LISTEN_PORT
+ server = CertmasterXMLRPCServer((listen_addr,listen_port))
server.logRequests = 0 # don't print stuff to console
server.register_instance(xmlrpcinstance)
xmlrpcinstance.logger.info("certmaster started")