From 09c8eaf304d1075980d8d9143545f2f16a1db34d Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 18:59:39 -0300
Subject: new style for 2.7

---
 manifests/base.pp | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 695241c..9e597a8 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,36 +1,33 @@
 class puppet::base {
 
-  if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' }
-
-  $puppet_majorversion = regsubst($puppetversion,'^(\d+\.\d+).*$','\1')
-
-  case $puppet_cleanup_clientbucket {
+  $puppet_majorversion = regsubst($::puppetversion,'^(\d+\.\d+).*$','\1')
+  case $puppet::cleanup_clientbucket {
     # if not set, don't do anything
-    '',undef: {}
-    default: { 
+    '',undef,false: {}
+    default: {
       tidy { "/var/lib/puppet/clientbucket":
         backup => false,
         recurse => true,
         rmdirs => true,
         type => mtime,
-        age => "$puppet_cleanup_clientbucket";
+        age => "$puppet::cleanup_clientbucket";
       }
     }
   }
 
   file { 'puppet_config':
-    path => "$puppet_config",
-    source => [ "puppet:///modules/site-puppet/client/${fqdn}/puppet.conf",
-                "puppet:///modules/site-puppet/client/puppet.conf.$operatingsystem",
-                "puppet:///modules/site-puppet/client/puppet.conf",
-                "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.$operatingsystem",
+    path => $puppet::config,
+    source => [ "puppet:///modules/site_puppet/client/${::fqdn}/puppet.conf",
+                "puppet:///modules/site_puppet/client/puppet.conf.${::operatingsystem}",
+                "puppet:///modules/site_puppet/client/puppet.conf",
+                "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.${::operatingsystem}",
                 "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf",
-                "puppet:///modules/puppet/client/puppet.conf.$operatingsystem",
+                "puppet:///modules/puppet/client/puppet.conf.${::operatingsystem}",
                 "puppet:///modules/puppet/client/puppet.conf" ],
     notify => Service[puppet],
-    # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf 
+    # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf
     # therefore it must be readable by puppet
-    owner => puppet, group => 0, mode => 600;  
+    owner => puppet, group => 0, mode => 600;
   }
 
   service { 'puppet':
-- 
cgit v1.2.3


From 8db4cf07c117d62c92b6ff2c46948e7fc4b74c2e Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Thu, 5 Dec 2013 11:49:56 +0100
Subject: make it possible to pass the content of the config from outside

---
 manifests/base.pp | 53 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

(limited to 'manifests/base.pp')

diff --git a/manifests/base.pp b/manifests/base.pp
index 9e597a8..5cb4c5d 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -1,3 +1,4 @@
+# configure general things of puppet
 class puppet::base {
 
   $puppet_majorversion = regsubst($::puppetversion,'^(\d+\.\d+).*$','\1')
@@ -5,35 +6,45 @@ class puppet::base {
     # if not set, don't do anything
     '',undef,false: {}
     default: {
-      tidy { "/var/lib/puppet/clientbucket":
-        backup => false,
+      tidy { '/var/lib/puppet/clientbucket':
+        backup  => false,
         recurse => true,
-        rmdirs => true,
-        type => mtime,
-        age => "$puppet::cleanup_clientbucket";
+        rmdirs  => true,
+        type    => mtime,
+        age     => $puppet::cleanup_clientbucket;
       }
     }
   }
 
   file { 'puppet_config':
-    path => $puppet::config,
-    source => [ "puppet:///modules/site_puppet/client/${::fqdn}/puppet.conf",
-                "puppet:///modules/site_puppet/client/puppet.conf.${::operatingsystem}",
-                "puppet:///modules/site_puppet/client/puppet.conf",
-                "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.${::operatingsystem}",
-                "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf",
-                "puppet:///modules/puppet/client/puppet.conf.${::operatingsystem}",
-                "puppet:///modules/puppet/client/puppet.conf" ],
-    notify => Service[puppet],
-    # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf
-    # therefore it must be readable by puppet
-    owner => puppet, group => 0, mode => 600;
+    path    => $puppet::config,
+    notify  => Service[puppet],
+    # if puppetmasterd is deployed by apache2/passenger it needs
+    # to read puppet.conf. therefore it must be readable by puppet
+    owner   => puppet,
+    group   => 0,
+    mode    => '0600';
+  }
+  if $puppet::config_content {
+    File['puppet_config'] {
+      content => $puppet::config_content
+    }
+  } else {
+    File['puppet_config'] {
+      source => [ "puppet:///modules/site_puppet/client/${::fqdn}/puppet.conf",
+                  "puppet:///modules/site_puppet/client/puppet.conf.${::operatingsystem}",
+                  'puppet:///modules/site_puppet/client/puppet.conf',
+                  "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf.${::operatingsystem}",
+                  "puppet:///modules/puppet/client/${puppet_majorversion}/puppet.conf",
+                  "puppet:///modules/puppet/client/puppet.conf.${::operatingsystem}",
+                  'puppet:///modules/puppet/client/puppet.conf' ]
+    }
   }
 
   service { 'puppet':
-    ensure => running,
-    enable => true,
-    hasstatus => true,
-    hasrestart => true,
+    ensure      => running,
+    enable      => true,
+    hasstatus   => true,
+    hasrestart  => true,
   }
 }
-- 
cgit v1.2.3