mostly merges of stuff I thought I had already committed and pushed

various s/func/certmaster changes

1 files changed, 16 insertions, 9 deletions

diff --git a/func/commonconfig.py b/func/commonconfig.py
index 292eb45..66f4cfc 100644
--- a/func/commonconfig.py
+++ b/func/commonconfig.py
@@ -1,15 +1,22 @@
-from config import BaseConfig, BoolOption, Option
+#!/usr/bin/python
+"""
+func
+
+Copyright 2007, Red Hat, Inc
+see AUTHORS
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
 
-class CMConfig(BaseConfig):
-    listen_addr = Option('')
-    cadir = Option('/etc/pki/func/ca')
-    certroot =  Option('/var/lib/certmaster/certmaster/certs')
-    csrroot = Option('/var/lib/certmaster/certmaster/csrs')
-    autosign = BoolOption(False)
+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, Option
 
 
 class FuncdConfig(BaseConfig):
     log_level = Option('INFO')
-    certmaster = Option('certmaster')
-    cert_dir = Option('/etc/pki/func')
     acl_dir = Option('/etc/func/minion-acl.d')