some certmaster fixes, mostly path stuff

diff --git a/certmaster.spec b/certmaster.spec
index 2643e36..ba581a6 100644 (file)
--- a/certmaster.spec
+++ b/certmaster.spec
@@ -67,7 +67,6 @@ rm -fr $RPM_BUILD_ROOT
 %{python_sitelib}/certmaster/*.py*
 %dir /var/log/certmaster
 %dir /var/lib/certmaster
-%dir /var/lib/certmaster/certmaster
 %doc AUTHORS README LICENSE
 %{_mandir}/man1/*.1.gz
 

diff --git a/setup.py b/setup.py
index 3c85112..203c405 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ if __name__ == "__main__":
         etcpath    = "/etc/%s" % NAME
         initpath   = "/etc/init.d/"
         logpath    = "/var/log/%s/" % NAME
-       certdir    = "/var/lib/%s/certmaster" % NAME
+       certdir    = "/var/lib/%s/" % NAME
         pkipath    = "/etc/pki/%s" % NAME
         rotpath    = "/etc/logrotate.d"
         aclpath    = "%s/minion-acl.d" % etcpath