X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;f=certmaster%2Futils.py;h=958d26ddb8208029927b99d4a2374631d7b38420;hb=8b44578eb6d42cef58627b88e99fc394c5b66674;hp=ecebad65a42c9953ed14b9bcca0e067bca9f8819;hpb=ca0b109bfb78736cb3997b536ac20dadf32485bd;p=certmaster.git

diff --git a/certmaster/utils.py b/certmaster/utils.py
old mode 100755
new mode 100644
index ecebad6..958d26d
--- 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
@@ -235,7 +235,7 @@ def run_triggers(ref, globber):
                 # in the triggers directory
                 continue
             if ref:
-                rc = sub_process.call([file, ref.name], shell=False)
+                rc = sub_process.call([file, ref], shell=False)
             else:
                 rc = sub_process.call([file], shell=False)
         except: