From 5b79de1dcc30f67efd5859e886fed89158f6c88e Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Tue, 4 Mar 2008 17:55:57 -0500 Subject: use the certmaster info from /etc/certmaster/minion.conf instead of /etc/func/minion.conf --- func/minion/utils.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'func') diff --git a/func/minion/utils.py b/func/minion/utils.py index 1133866..acdf613 100755 --- a/func/minion/utils.py +++ b/func/minion/utils.py @@ -22,7 +22,7 @@ import glob import codes from func import certs from func.config import read_config -from func.commonconfig import FuncdConfig +from certmaster.commonconfig import MinionConfig from func import logger # "localhost" is a lame hostname to use for a key, so try to get @@ -44,10 +44,10 @@ def get_hostname(): return hostname - config_file = '/etc/func/minion.conf' - config = read_config(config_file, FuncdConfig) + config_file = '/etc/certmaster/minion.conf' + minion_config = read_config(config_file, MinionConfig) - server = config.certmaster + server = minion_config.certmaster port = 51235 try: -- cgit