diff options
author | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-03-04 17:55:57 -0500 |
---|---|---|
committer | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-03-04 17:55:57 -0500 |
commit | 5b79de1dcc30f67efd5859e886fed89158f6c88e (patch) | |
tree | 5a2ded2c906226b494a87a610c5265d472e5011b | |
parent | 1afe5b3bd97d292ab4c024ee7c434d036cb5db9d (diff) | |
download | func-5b79de1dcc30f67efd5859e886fed89158f6c88e.tar.gz func-5b79de1dcc30f67efd5859e886fed89158f6c88e.tar.xz func-5b79de1dcc30f67efd5859e886fed89158f6c88e.zip |
use the certmaster info from /etc/certmaster/minion.conf instead of /etc/func/minion.conf
-rwxr-xr-x | func/minion/utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
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: |