From 600548e2141eab0540b5af1c83742c6b82ff82f4 Mon Sep 17 00:00:00 2001
From: Ossi Herrala <ossi.herrala@codenomicon.com>
Date: Thu, 12 Apr 2012 09:26:19 +0000
Subject: [PATCH 1/2] Add variable to control Puppet's own diffing of various
 files.

---
 puppet/manifests/init.pp         | 4 ++++
 puppet/templates/puppet.conf.erb | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 0b057a5..2710c87 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -13,6 +13,10 @@ class puppet::client {
         $puppet_keylength = "2048"
     }
 
+    if ! $puppet_diffargs {
+        $puppet_diffargs = "-u"
+    }
+
     case $operatingsystem {
         openbsd: { $vardir = "/var/puppet" }
         default: { $vardir = "/var/lib/puppet" }
diff --git a/puppet/templates/puppet.conf.erb b/puppet/templates/puppet.conf.erb
index d214146..8670b0b 100644
--- a/puppet/templates/puppet.conf.erb
+++ b/puppet/templates/puppet.conf.erb
@@ -39,6 +39,9 @@
     # The bit length of keys.
     keylength = <%= puppet_keylength %>
 
+    # Arguments for puppet's use of diff
+    diff_args = <%= puppet_diffargs %>
+
 <% if puppetversion[/\d+/].to_i >= 2 -%>
 [agent]
     # Ignore site manifest when run as agent. Fixes warnings about

From 287701cffb222382e6cd94c019bb9caaa1605578 Mon Sep 17 00:00:00 2001
From: Ossi Herrala <ossi.herrala@codenomicon.com>
Date: Tue, 17 Apr 2012 07:28:05 +0000
Subject: [PATCH 2/2] OpenBSD gave error. Add empty case since /etc/localtime
 is enough for setting timezone.

---
 time/manifests/init.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/time/manifests/init.pp b/time/manifests/init.pp
index a54be62..1aeed73 100644
--- a/time/manifests/init.pp
+++ b/time/manifests/init.pp
@@ -36,6 +36,7 @@ class time::zone {
                 content => "$timezone_set\n",
             }
         }
+        openbsd: { } # file /etc/localtime is enough
         default: {
             fail("time::zone not supported on ${operatingsystem}")
         }