Config file tweaks

diff --git a/certmaster/commonconfig.py b/certmaster/commonconfig.py
index f4e96be..1f11e47 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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