From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Jul 2011 18:38:59 +0000 (-0300)
Subject: Updating to site-module convention
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9c83d350655d990d5f87a98fcfb73fbe2ac777fd;p=puppet-puppet.git

Updating to site-module convention
---

diff --git a/manifests/ca.pp b/manifests/ca.pp
index 3fb9a48..8ec6b2e 100644
--- a/manifests/ca.pp
+++ b/manifests/ca.pp
@@ -20,36 +20,36 @@ class puppetmaster::ca {
         owner   => puppet,
         group   => puppet,
         mode    => 0664,
-        source  => "puppet://$server/files/puppetmaster/ssl/ca/ca_crl.pem";
+        source  => "puppet:///modules/site-puppet/puppetmaster/ssl/ca/ca_crl.pem";
       '/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";
+        source  => "puppet:///modules/site-puppet/puppetmaster/ssl/ca/private/ca.pass";
       '/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";
+        source  => "puppet:///modules/site-puppet/puppetmaster/ssl/ca/ca_key.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";
+        source  => "puppet:///modules/site-puppet/puppetmaster/ssl/ca/ca_crt.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";
+        source  => "puppet:///modules/site-puppet/puppetmaster/ssl/ca/ca_pub.pem";
       '/var/lib/puppetmaster/ssl/certs/ca.pem':
         ensure  => present,
         owner   => puppet,
         group   => puppet,
         mode    => 0644,
-        source  => "puppet://$server/files/puppetmaster/ssl/certs/ca.pem";
+        source  => "puppet:///modules/site-puppet/puppetmaster/ssl/certs/ca.pem";
     }
 }