From 48b1e96d3c66a1a733ca573505e7203651142308 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Wed, 12 Nov 2008 11:53:59 -0500 Subject: 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. --- certmaster/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'certmaster/utils.py') diff --git a/certmaster/utils.py b/certmaster/utils.py index 5544b05..958d26d 100755 --- a/certmaster/utils.py +++ b/certmaster/utils.py @@ -127,7 +127,7 @@ def get_hostname(talk_to_certmaster=True): config = read_config(config_file, MinionConfig) server = config.certmaster - port = 51235 + port = config.certmaster_port try: s = socket.socket() @@ -155,7 +155,7 @@ def create_minion_keys(): config_file = '/etc/certmaster/minion.conf' config = read_config(config_file, MinionConfig) cert_dir = config.cert_dir - master_uri = 'http://%s:51235/' % config.certmaster + master_uri = 'http://%s:%s/' % (config.certmaster, config.certmaster_port) # print "DEBUG: acquiring hostname" hn = get_hostname() # print "DEBUG: hostname = %s\n" % hn -- cgit