From 849f6f9bc2c6e9cf63d63dc3ee46dc5ec1811362 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 11 Feb 2010 14:15:23 -0500
Subject: improve puppetmaster support on debian

---
 manifests/puppetmaster.pp        |  2 +-
 manifests/puppetmaster/debian.pp | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 manifests/puppetmaster/debian.pp

(limited to 'manifests')

diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 37d59b5..1b1094c 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -1,7 +1,7 @@
 # manifests/puppetmaster.pp
 class puppet::puppetmaster inherits puppet {
     case $operatingsystem {
-        debian: { include puppet::puppetmaster::package }
+        debian: { include puppet::puppetmaster::debian }
         centos: { include puppet::puppetmaster::centos }
         default: {
             case $kernel {
diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp
new file mode 100644
index 0000000..20ac997
--- /dev/null
+++ b/manifests/puppetmaster/debian.pp
@@ -0,0 +1,11 @@
+# manifests/puppetmaster/debian.pp
+
+class puppet::puppetmaster::debian inherits puppet::puppetmaster::package {
+
+    Package['puppet-server'] {
+        name => 'puppetmaster',
+        alias => 'puppet-server',
+    }
+
+}
+
-- 
cgit v1.2.3


From 0f0434a582c1f3bd274a79e51ab34a2f4887e659 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 31 Mar 2010 14:25:18 -0400
Subject: Add optional $puppet_version and $facter_version variables, defaults
 to 'present'

---
 manifests/linux.pp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'manifests')

diff --git a/manifests/linux.pp b/manifests/linux.pp
index afbda8d..12112e1 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,6 +1,21 @@
 class puppet::linux inherits puppet::base {
-    package{ [ 'puppet', 'facter' ]:
-        ensure => present,
+
+    $real_puppet_version = $puppet_version ? {
+        '' => 'present',
+        default => $puppet_version,
+    }
+    
+    $real_facter_version = $facter_version ? {
+        '' => 'present',
+        default => $facter_version,
+    }
+
+    package{ 'puppet':
+        ensure => $real_puppet_version,
+    }
+    
+    package{ 'facter':
+        ensure => $real_facter_version,
     }
 
     # package bc needed for cron
-- 
cgit v1.2.3