diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-27 18:16:47 -0400 |
| commit | a03bb286f4756701b9fc7fc737037b9317df054e (patch) | |
| tree | 76b52a415e302592ceaecd6bae203fad99261d15 | |
| parent | ba1bc60f7b855e4810494fa81d7f0e0fa9858da4 (diff) | |
| download | func-a03bb286f4756701b9fc7fc737037b9317df054e.tar.gz func-a03bb286f4756701b9fc7fc737037b9317df054e.tar.xz func-a03bb286f4756701b9fc7fc737037b9317df054e.zip | |
back to calling it certmaster not certmaster_server
| -rw-r--r-- | etc/minion.conf | 2 | ||||
| -rw-r--r-- | func/commonconfig.py | 2 | ||||
| -rwxr-xr-x | minion/utils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/minion.conf b/etc/minion.conf index e790839..9e18eac 100644 --- a/etc/minion.conf +++ b/etc/minion.conf @@ -2,6 +2,6 @@ [main] log_level = DEBUG -certmaster_server = certmaster +certmaster = certmaster cert_dir = /etc/pki/func diff --git a/func/commonconfig.py b/func/commonconfig.py index ab6cc26..ab02082 100644 --- a/func/commonconfig.py +++ b/func/commonconfig.py @@ -12,5 +12,5 @@ class CMConfig(BaseConfig): class FuncdConfig(BaseConfig): log_level = Option('INFO') - certmaster_server = Option('certmaster') + certmaster = Option('certmaster') cert_dir = Option('/etc/pki/func') diff --git a/minion/utils.py b/minion/utils.py index 074d41a..03d95d8 100755 --- a/minion/utils.py +++ b/minion/utils.py @@ -30,7 +30,7 @@ def create_minion_keys(): config_file = '/etc/func/minion.conf' config = read_config(config_file, FuncdConfig) cert_dir = config.cert_dir - master_uri = 'http://%s:51235/' % config.certmaster_server + master_uri = 'http://%s:51235/' % config.certmaster hn = socket.getfqdn() key_file = '%s/%s.pem' % (cert_dir, hn) |