From 70c8c35ef1d657ad2b6ea22d3417dd2c4f6b211f Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@panoulu.net>
Date: Mon, 24 May 2010 16:26:35 +0300
Subject: [PATCH] Updated puppet module for OpenBSD 4.7.

---
 puppet/manifests/init.pp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 6eab232..51c1715 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -16,14 +16,6 @@ class puppet::client {
 	}
     }
         
-    package { "puppet":
-        name   => $operatingsystem ? {
-            openbsd => "ruby-puppet",
-            default => "puppet",
-        },
-        ensure => present,
-    }
-    
     file { "/etc/puppet/puppet.conf":
         ensure  => present,
         content => template("puppet/puppet.conf.erb"),
@@ -33,7 +25,6 @@ class puppet::client {
             openbsd => wheel,
             default => root
         },
-        require => Package["puppet"],
     }
 
     case $operatingsystem {
@@ -41,11 +32,15 @@ class puppet::client {
             service { "puppet":
                 ensure    => running,
                 enable    => true,
-                binary    => "/usr/local/bin/puppetd",
-                start     => "/usr/local/bin/puppetd",
-                restart   => "/usr/bin/pkill -HUP -f /usr/local/bin/puppetd",
+                start     => $operatingsystemrelease ? {
+                    /4\.[1-6]/ => "/usr/local/bin/puppetd",
+                    default    => "/usr/local/sbin/puppetd",
+                },
+                restart   => $operatingsystemrelease ? {
+                    /4\.[1-6]/ => "/usr/bin/pkill -HUP -f /usr/local/bin/puppetd",
+                    default    => "/usr/bin/pkill -HUP -f /usr/local/sbin/puppetd",
+                },
                 pattern   => puppetd,
-                require   => Package["puppet"],
                 subscribe => File["/etc/puppet/puppet.conf"],
             }
         }
@@ -54,7 +49,6 @@ class puppet::client {
                 ensure    => running,
                 enable    => true,
                 restart   => "/usr/bin/pkill -HUP puppetd",
-                require   => Package["puppet"],
                 subscribe => File["/etc/puppet/puppet.conf"],
             }
         }