Fix: hash merge on classes and resources lookups

diff --git a/manifests/init.pp b/manifests/init.pp
index 5015adc51640b362fe3d889caf60bebff957f99c..f3f41a3f3afb983d2fe0fb0f9498d4635370b0d8 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -26,7 +26,7 @@ class nodo(
   }
 
   # Include additional classes
-  lookup('classes', { merge => unique, default_value => [] }).include
+  lookup('classes', { merge => hash, default_value => [] }).include
 
   # Declare resources
   class { "nodo::resources": }

diff --git a/manifests/resources.pp b/manifests/resources.pp
index 8fe188fef6816097de3d62cb7219e2125d44a238..940e544e77575ae8c44090887d0b46acf6cd093d 100644 (file)
--- a/manifests/resources.pp
+++ b/manifests/resources.pp
@@ -5,58 +5,58 @@ class nodo::resources {
   }
 
   # Packages
-  $packages = lookup('packages', undef, undef, {})
+  $packages = lookup('packages', { merge => hash, default_value => [] })
   create_resources('package', $packages)
 
   # Files
-  $files = lookup('files', undef, undef, {})
+  $files = lookup('files', { merge => hash, default_value => {} })
   create_resources('file', $files)
 
   # File lines
-  $file_lines = lookup('file_lines', undef, undef, {})
+  $file_lines = lookup('file_lines', { merge => hash, default_value => {} })
   create_resources('file_line', $file_lines)
 
   # Virtual machines
-  $vms = lookup('virtual::machines', undef, undef, {})
+  $vms = lookup('virtual::machines', { merge => hash, default_value => {} })
   create_resources('nodo::subsystem::virtual::instance', $vms)
 
   # Users
-  $users = lookup('users', undef, undef, {})
+  $users = lookup('users', { merge => hash, default_value => {} })
   create_resources('user::manage', $users)
 
   # Backup users
-  $backup_users = lookup('backup::users', undef, undef, {})
+  $backup_users = lookup('backup_users', { merge => hash, default_value => {} })
   create_resources('backup::user', $backup_users)
 
   # Cron entries
-  $cron = lookup('cron::jobs', undef, undef, {})
+  $cron = lookup('cron::jobs', { merge => hash, default_value => {} })
   create_resources('cron', $cron)
 
   # Hosts
-  $hosts = lookup('hosts', undef, undef, {})
+  $hosts = lookup('hosts', { merge => hash, default_value => {} })
   create_resources('host', $hosts)
 
   # Nginx entries
-  $nginx = lookup('nginx::sites', undef, undef, {})
+  $nginx = lookup('nginx::sites', { merge => hash, default_value => {} })
   create_resources('nginx::site', $nginx)
 
   # SSH keys
-  $sshkeys = lookup('sshkeys', undef, undef, {})
+  $sshkeys = lookup('sshkeys', { merge => hash, default_value => {} })
   create_resources('sshkey', $sshkeys)
 
   # SSH Authorized keys
-  $ssh_authorized_keys = lookup('ssh_authorized_keys', undef, undef, {})
+  $ssh_authorized_keys = lookup('ssh_authorized_keys', { merge => hash, default_value => {} })
   create_resources('ssh_authorized_key', $ssh_authorized_keys)
 
   # PaX flags
-  $pax = lookup('nodo::subsystem::grsec::paxctl', undef, undef, {})
+  $pax = lookup('nodo::subsystem::grsec::paxctl', { merge => hash, default_value => {} })
   create_resources('nodo::subsystem::grsec::paxctl', $pax)
 
   # Exec
-  $execs = lookup('execs', undef, undef, {})
+  $execs = lookup('execs', { merge => hash, default_value => {} })
   create_resources('exec', $execs)
 
   # Repositories
-  $vcsrepos = lookup('vcsrepos', undef, undef, {})
+  $vcsrepos = lookup('vcsrepos', { merge => hash, default_value => {} })
   create_resources('vcsrepo', $vcsrepos)
 }