resolve conflict

icann-dns · Jul 3, 2015 · 451add0 · 451add0
1 parent 329b45d
commit 451add0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -9,7 +9,7 @@
       $confdir          = '/etc/unbound'
       $logdir           = '/var/log'
       $service_name     = 'unbound'
-      $package_name     = undef
+      $package_name     = 'unbound'
       $package_provider = undef
       $runtime_dir      = '/var/lib/unbound'
       $owner            = 'unbound'
@@ -53,7 +53,7 @@
       } else {
         $confdir        = '/var/unbound'
         $service_name   = 'local_unbound'
-        $package_name   = 'unbound'
+        $package_name   = undef
         $pidfile        = '/var/run/local_unbound.pid'
       }
       $logdir           = '/var/log/unbound'