From 402c6e37f964cdc24d071939ae0280f1228cdc70 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Mon, 23 Nov 2015 14:27:12 +0200
Subject: [PATCH] dns: Fix package depencies from dns::zone.

---
 dns/manifests/init.pp | 58 +++++++++++--------------------------------
 1 file changed, 14 insertions(+), 44 deletions(-)

diff --git a/dns/manifests/init.pp b/dns/manifests/init.pp
index a5d9d25..753cef7 100644
--- a/dns/manifests/init.pp
+++ b/dns/manifests/init.pp
@@ -38,6 +38,9 @@ class dns::server {
             ensure => installed,
             name   => $bind_package,
         }
+        $package_require = Package["bind"]
+    } else {
+        $package_require = undef
     }
 
     # first set per os paths
@@ -133,10 +136,7 @@ class dns::server {
         mode    => "0640",
         owner   => "root",
         group   => $group,
-        require => $bind_package ? {
-            undef   => undef,
-            default => Package["bind"],
-        },
+        require => $package_require,
     }
     exec { "rndc-confgen":
         command => $chroot ? {
@@ -180,10 +180,7 @@ class dns::server {
         mode    => "0640",
         owner   => "root",
         group   => $group,
-        require => $bind_package ? {
-            undef   => undef,
-            default => Package["bind"],
-        },
+        require => $package_require,
         notify  => Exec["generate-named-conf"],
     }
     file { "/usr/local/sbin/generate-named-conf.sh":
@@ -214,10 +211,7 @@ class dns::server {
         mode    => "0640",
         owner   => "root",
         group   => $group,
-        require => $bind_package ? {
-            undef   => undef,
-            default => Package["bind"],
-        },
+        require => $package_require,
         notify  => Exec["named-checkconf"],
     }
 
@@ -229,10 +223,7 @@ class dns::server {
         mode    => "0640",
         owner   => "root",
         group   => $group,
-        require => $bind_package ? {
-            undef   => undef,
-            default => Package["bind"],
-        },
+        require => $package_require,
         notify  => Exec["named-checkconf"],
     }
 }
@@ -410,10 +401,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
                     "master" => File["${dns::server::chroot}${zonedir}/db.${zonefile}"],
                     default  => undef,
                 },
-                require => $::operatingsystem ? {
-                    "openbsd" => undef,
-                    default   => Package["bind"],
-                },
+                require => $::dns::server::package_require,
             }
         }
     }
@@ -424,10 +412,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
         mode    => "0640",
         owner   => "root",
         group   => $dns::server::group,
-        require => $::operatingsystem ? {
-            "openbsd" => undef,
-            default   => Package["bind"],
-        },
+        require => $::dns::server::package_require,
         notify  => Exec["generate-named-conf"],
     }
 
@@ -439,10 +424,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
                  mode    => "0640",
                  owner   => "root",
                  group   => $dns::server::group,
-                 require => $::operatingsystem ? {
-                     "openbsd" => undef,
-                     default   => Package["bind"],
-                 },
+                 require => $::dns::server::package_require,
                  notify  => Exec["generate-named-conf"],
             }
         } else {
@@ -459,10 +441,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
                 owner   => "root",
                 group   => $dns::server::group,
                 backup  => false,
-                require => $::operatingsystem ? {
-                    "openbsd" => undef,
-                    default   => Package["bind"],
-                },
+                require => $::dns::server::package_require,
                 notify  => Exec["named-checkconf"],
             }
 
@@ -471,10 +450,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
                 mode    => "0640",
                 owner   => "root",
                 group   => $dns::server::group,
-                require => $::operatingsystem ? {
-                    "openbsd" => undef,
-                    default   => Package["bind"],
-                },
+                require => $::dns::server::package_require,
                 notify  => Exec["named-checkconf"],
             }
             file { "${dns::server::chroot}${zonedir}/db.${zonefile}-dynamic.d":
@@ -482,10 +458,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
                 mode    => "0640",
                 owner   => "root",
                 group   => $dns::server::group,
-                require => $::operatingsystem ? {
-                    "openbsd" => undef,
-                    default   => Package["bind"],
-                },
+                require => $::dns::server::package_require,
                 purge   => true,
                 force   => true,
                 recurse => true,
@@ -503,10 +476,7 @@ define dns::zone($role = "master", $master = "", $slaves = [], $forwarders = [],
                 mode    => "0640",
                 owner   => "root",
                 group   => $dns::server::group,
-                require => $::operatingsystem ? {
-                    "openbsd" => undef,
-                    default   => Package["bind"],
-                },
+                require => $::dns::server::package_require,
                 notify  => Exec["named-checkconf"],
             }