From 5d6c2d0a1d639c1173e1df393da5bcd4d951e9bd Mon Sep 17 00:00:00 2001 From: Daniele Sluijters Date: Wed, 22 Apr 2015 14:07:31 +0200 Subject: init: Merge the right way around. First take the defaults and the merge the user passed in options into them, not the other way around as then our defaults end up overriding some of the keys users pass in. --- manifests/init.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'manifests') diff --git a/manifests/init.pp b/manifests/init.pp index 0f9829d..b524778 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -28,20 +28,20 @@ class unattended_upgrades ( validate_array($blacklist) validate_array($origins) validate_hash($auto) - $_auto = merge($auto, $::unattended_upgrades::default_auto) + $_auto = merge($::unattended_upgrades::default_auto, $auto) validate_hash($mail) if $mail['only_on_error'] { validate_bool($mail['only_on_error']) } - $_mail = merge($mail, $::unattended_upgrades::default_mail) + $_mail = merge($::unattended_upgrades::default_mail, $mail) validate_hash($backup) - $_backup = merge($backup, $::unattended_upgrades::default_backup) + $_backup = merge($::unattended_upgrades::default_backup, $backup) validate_hash($age) - $_age = merge($age, $::unattended_upgrades::default_age) + $_age = merge($::unattended_upgrades::default_age, $age) validate_hash($size) - $_size = merge($size, $::unattended_upgrades::default_size) + $_size = merge($::unattended_upgrades::default_size, $size) validate_hash($upgradeable_packages) - $_upgradeable_packages = merge($upgradeable_packages, $::unattended_upgrades::default_upgradeable_packages) + $_upgradeable_packages = merge($::unattended_upgrades::default_upgradeable_packages, $upgradeable_packages) package { 'unattended-upgrades': ensure => $package_ensure, -- cgit v1.2.3