diff options
author | Paweł Kraśnicki <paul.krasnicki@gmail.com> | 2016-07-11 13:54:47 +0200 |
---|---|---|
committer | Paweł Kraśnicki <paul.krasnicki@gmail.com> | 2016-07-12 18:09:52 +0200 |
commit | 36fea4846d719f6b3794606f73d6d536a926e541 (patch) | |
tree | ecde58058e5e15d0b9dcb38b877bab9ce3e00618 | |
parent | 9e8355c188c04d909745cd28ca47b67b499f54fb (diff) |
Reorder validation to match class declaration
-rw-r--r-- | manifests/init.pp | 65 |
1 files changed, 40 insertions, 25 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index aeb9868..f7eddbe 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,49 +21,64 @@ class unattended_upgrades ( $options = {}, ) inherits ::unattended_upgrades::params { + validate_hash($age) + $_age = merge($::unattended_upgrades::default_age, $age) + + validate_hash($auto) + $_auto = merge($::unattended_upgrades::default_auto, $auto) + + validate_hash($backup) + $_backup = merge($::unattended_upgrades::default_backup, $backup) + + validate_array($blacklist) + + if $dl_limit != undef { + validate_integer($dl_limit, undef, 0) + } + + validate_integer($enable, 1, 0) + + validate_bool($install_on_shutdown) + + validate_bool($legacy_origin) + validate_array($origins) if $legacy_origin == undef or $origins == undef { fail('Please explicitly specify unattended_upgrades::legacy_origin and unattended_upgrades::origins.') } - validate_bool( - $install_on_shutdown, - $legacy_origin, - $minimal_steps, - ) - validate_array($blacklist) - validate_array($origins) - validate_hash($auto) - $_auto = merge($::unattended_upgrades::default_auto, $auto) validate_hash($mail) if $mail['only_on_error'] { validate_bool($mail['only_on_error']) } $_mail = merge($::unattended_upgrades::default_mail, $mail) - validate_hash($backup) - $_backup = merge($::unattended_upgrades::default_backup, $backup) - validate_hash($age) - $_age = merge($::unattended_upgrades::default_age, $age) + + validate_bool($minimal_steps) + + validate_string($package_ensure) + + if $random_sleep != undef { + validate_integer($random_sleep, undef, 0) + } + validate_integer($size) + + validate_integer($update, undef, 0) + + validate_integer($upgrade, undef, 0) + validate_hash($upgradeable_packages) $_upgradeable_packages = merge($::unattended_upgrades::default_upgradeable_packages, $upgradeable_packages) + + validate_integer($verbose, undef, 0) + + validate_bool($notify_update) + validate_hash($options) $_options = merge($unattended_upgrades::default_options, $options) validate_bool($_options['force_confdef']) validate_bool($_options['force_confold']) validate_bool($_options['force_confnew']) validate_bool($_options['force_confmiss']) - if $dl_limit != undef { - validate_integer($dl_limit, undef, 0) - } - validate_integer($enable, 1, 0) - validate_string($package_ensure) - if $random_sleep != undef { - validate_integer($random_sleep, undef, 0) - } - validate_integer($update, undef, 0) - validate_integer($upgrade, undef, 0) - validate_integer($verbose, undef, 0) - validate_bool($notify_update) package { 'unattended-upgrades': ensure => $package_ensure, |