X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsetting.pp;h=a3fc3630bd5b6e3f4a1f0c9c40ae1c621217d60b;hb=refs%2Fheads%2Frelease-prep;hp=e743a5c2de80b17202d8546d0d76f16a70535582;hpb=6c1fd8e819cc8ffb44ac187bb0fa7051d2958cc6;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/setting.pp b/manifests/setting.pp index e743a5c..a3fc363 100644 --- a/manifests/setting.pp +++ b/manifests/setting.pp @@ -21,12 +21,11 @@ # define apt::setting ( Variant[String, Integer, Array] $priority = 50, - Optional[Enum['file', 'present', 'absent']] $ensure = file, + Enum['file', 'present', 'absent'] $ensure = file, Optional[String] $source = undef, Optional[String] $content = undef, Boolean $notify_update = true, ) { - if $content and $source { fail('apt::setting cannot have both content and source') } @@ -56,8 +55,8 @@ define apt::setting ( $_priority = $priority } - $_path = $::apt::config_files[$setting_type]['path'] - $_ext = $::apt::config_files[$setting_type]['ext'] + $_path = $apt::config_files[$setting_type]['path'] + $_ext = $apt::config_files[$setting_type]['ext'] if $notify_update { $_notify = Class['apt::update'] @@ -69,7 +68,6 @@ define apt::setting ( ensure => $ensure, owner => 'root', group => 'root', - mode => '0644', content => $content, source => $source, notify => $_notify,