summaryrefslogtreecommitdiffstats
path: root/certmaster/utils.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/utils.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/utils.py')
-rwxr-xr-xcertmaster/utils.py4
1 files changed, 2 insertions, 2 deletions
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