diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-02-25 17:54:03 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-02-25 17:54:03 -0500 |
| commit | 140dc3622629501333bd253fadd27d810871782f (patch) | |
| tree | f666234c94ec12a680e1c10316b42bda3c18e527 | |
| parent | 25e64a20184460d732d6c1b0847f1e5109ed2d30 (diff) | |
| download | certmaster-140dc3622629501333bd253fadd27d810871782f.tar.gz certmaster-140dc3622629501333bd253fadd27d810871782f.tar.xz certmaster-140dc3622629501333bd253fadd27d810871782f.zip | |
Config file tweaks
| -rw-r--r-- | certmaster/commonconfig.py | 19 | ||||
| -rw-r--r-- | etc/certmaster.conf | 5 | ||||
| -rw-r--r-- | etc/minion.conf | 3 |
3 files changed, 23 insertions, 4 deletions
diff --git a/certmaster/commonconfig.py b/certmaster/commonconfig.py index f4e96be..1f11e47 100644 --- a/certmaster/commonconfig.py +++ b/certmaster/commonconfig.py @@ -1,9 +1,26 @@ +""" +Default configuration values for certmaster items when +not specified in config file. + +Copyright 2008, Red Hat, Inc +see AUTHORS + +This software may be freely redistributed under the terms of the GNU +general public license. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +""" + + from config import BaseConfig, BoolOption, IntOption, Option class CMConfig(BaseConfig): log_level = Option('INFO') listen_addr = Option('') cadir = Option('/etc/pki/certmaster/ca') + cert_dir = Option('/etc/pki/certmaster') certroot = Option('/var/lib/certmaster/certmaster/certs') csrroot = Option('/var/lib/certmaster/certmaster/csrs') autosign = BoolOption(False) @@ -12,4 +29,4 @@ class MinionConfig(BaseConfig): log_level = Option('INFO') certmaster = Option('certmaster') cert_dir = Option('/etc/pki/certmaster') - # acl_dir = Option('/etc/certmaster/minion-acl.d') + diff --git a/etc/certmaster.conf b/etc/certmaster.conf index 7d1c37b..724e3ea 100644 --- a/etc/certmaster.conf +++ b/etc/certmaster.conf @@ -1,7 +1,10 @@ +# configuration for certmasterd and certmaster-ca + [main] +autosign = no listen_addr = cadir = /etc/pki/certmaster/ca +cert_dir = /etc/pki/certmaster certroot = /var/lib/certmaster/certmaster/certs csrroot = /var/lib/certmaster/certmaster/csrs -autosign = no diff --git a/etc/minion.conf b/etc/minion.conf index 6f6aa71..ea3d304 100644 --- a/etc/minion.conf +++ b/etc/minion.conf @@ -1,8 +1,7 @@ # configuration for minions [main] -log_level = DEBUG certmaster = certmaster +log_level = DEBUG cert_dir = /etc/pki/certmaster -acl_dir = /etc/certmaster/minion-acl.d |