Fix paths in logs

diff --git a/etc/certmaster.conf b/etc/certmaster.conf
index 71b2068..7d1c37b 100644 (file)
--- a/etc/certmaster.conf
+++ b/etc/certmaster.conf
@@ -1,7 +1,7 @@
 [main]
 listen_addr = 
-cadir = /etc/pki/func/ca
-certroot = /var/lib/func/certmaster/certs
-csrroot = /var/lib/func/certmaster/csrs
+cadir = /etc/pki/certmaster/ca
+certroot = /var/lib/certmaster/certmaster/certs
+csrroot = /var/lib/certmaster/certmaster/csrs
 autosign = no
 

diff --git a/etc/certmaster_rotate b/etc/certmaster_rotate
index e12edfb..975966a 100644 (file)
--- a/etc/certmaster_rotate
+++ b/etc/certmaster_rotate
@@ -1,16 +1,16 @@
-/var/log/func/audit.log {
+/var/log/certmaster/audit.log {
    missingok
    notifempty
    rotate 4
    weekly
    postrotate
-      if [ -f /var/lock/subsys/funcd ]; then
-         /etc/init.d/funcd condrestart
+      if [ -f /var/lock/subsys/certmasterd ]; then
+         /etc/init.d/certmasterd condrestart
       fi
    endscript
 }
 
-/var/log/func/func.log {
+/var/log/certmaster/certmaster.log {
    missingok
    notifempty
    rotate 4

diff --git a/etc/minion.conf b/etc/minion.conf
index f2e2b34..6f6aa71 100644 (file)
--- a/etc/minion.conf
+++ b/etc/minion.conf
@@ -3,6 +3,6 @@
 [main]
 log_level = DEBUG
 certmaster = certmaster
-cert_dir = /etc/pki/func
-acl_dir = /etc/func/minion-acl.d
+cert_dir = /etc/pki/certmaster
+acl_dir = /etc/certmaster/minion-acl.d