Trimming more stuff out.

[certmaster.git] / certmaster / commonconfig.py

diff --git a/certmaster/commonconfig.py b/certmaster/commonconfig.py
index 9fd3356..baf6a88 100644 (file)
--- a/certmaster/commonconfig.py
+++ b/certmaster/commonconfig.py
@@ -2,14 +2,14 @@ from config import BaseConfig, BoolOption, IntOption, Option
 
 class CMConfig(BaseConfig):
     listen_addr = Option('')
-    cadir = Option('/etc/pki/func/ca')
-    certroot =  Option('/var/lib/func/certmaster/certs')
-    csrroot = Option('/var/lib/func/certmaster/csrs')
+    cadir = Option('/etc/pki/certmaster/ca')
+    certroot =  Option('/var/lib/certmaster/certmaster/certs')
+    csrroot = Option('/var/lib/certmaster/certmaster/csrs')
     autosign = BoolOption(False)
 
 
 class FuncdConfig(BaseConfig):
     log_level = Option('INFO')
     certmaster = Option('certmaster')
-    cert_dir = Option('/etc/pki/func')
-    acl_dir = Option('/etc/func/minion-acl.d')
+    cert_dir = Option('/etc/pki/certmaster')
+    acl_dir = Option('/etc/certmaster/minion-acl.d')