Fixing puppetmaster vardir at puppetmaster::ca

diff --git a/manifests/ca.pp b/manifests/ca.pp
index 9a0d267bb61ce1fa33c47e4c008ee69197c1c2e2..1c5055e7b0e3250c8e82760d46c7bbe1cc8897e3 100644 (file)
--- a/manifests/ca.pp
+++ b/manifests/ca.pp
@@ -1,51 +1,51 @@
 class puppetmaster::ca {
     file {
-      '/var/lib/puppet/ssl/ca':
+      '/var/lib/puppetmaster/ssl/ca':
         ensure => directory,
         owner   => puppet,
         group   => puppet,
         mode    => 0770;
-      '/var/lib/puppet/ssl/ca/private':
+      '/var/lib/puppetmaster/ssl/ca/private':
         ensure => directory,
         owner   => puppet,
         group   => puppet,
         mode    => 0770;
-      '/var/lib/puppet/ssl/certs':
+      '/var/lib/puppetmaster/ssl/certs':
         ensure => directory,
         owner   => puppet,
         group   => puppet,
         mode    => 0755;
-      '/var/lib/puppet/ssl/ca/ca_crl.pem':
+      '/var/lib/puppetmaster/ssl/ca/ca_crl.pem':
         ensure  => present,
         owner   => puppet,
         group   => puppet,
         mode    => 0664,
         source  => "puppet://$server/files/puppetmaster/ssl/ca/ca_crl.pem";
-      '/var/lib/puppet/ssl/ca/private/ca.pass':
+      '/var/lib/puppetmaster/ssl/ca/private/ca.pass':
         ensure  => present,
         owner   => puppet,
         group   => puppet,
         mode    => 0660,
         source  => "puppet://$server/files/puppetmaster/ssl/ca/private/ca.pass";
-      '/var/lib/puppet/ssl/ca/ca_key.pem':
+      '/var/lib/puppetmaster/ssl/ca/ca_key.pem':
         ensure  => present,
         owner   => puppet,
         group   => puppet,
         mode    => 0660,
         source  => "puppet://$server/files/puppetmaster/ssl/ca/ca_key.pem";
-      '/var/lib/puppet/ssl/ca/ca_crt.pem':
+      '/var/lib/puppetmaster/ssl/ca/ca_crt.pem':
         ensure  => present,
         owner   => puppet,
         group   => puppet,
         mode    => 0660,
         source  => "puppet://$server/files/puppetmaster/ssl/ca/ca_crt.pem";
-      '/var/lib/puppet/ssl/ca/ca_pub.pem':
+      '/var/lib/puppetmaster/ssl/ca/ca_pub.pem':
         ensure  => present,
         owner   => puppet,
         group   => puppet,
         mode    => 0640,
         source  => "puppet://$server/files/puppetmaster/ssl/ca/ca_pub.pem";
-      '/var/lib/puppet/ssl/certs/ca.pem:':
+      '/var/lib/puppetmaster/ssl/certs/ca.pem:':
         ensure  => present,
         owner   => puppet,
         group   => puppet,