X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=0512fa96c9ac48440091843781d617ba9cf25cd9;hb=c65774204d7ab91f46f2aac243ec2650f2b39565;hp=65afefdbe1b10550182b3eb785fa1922a949074e;hpb=f04eb5ab71aab98bdd999783ca71244f66145d2c;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/source.pp b/manifests/source.pp index 65afefd..0512fa9 100644 --- a/manifests/source.pp +++ b/manifests/source.pp @@ -15,14 +15,14 @@ define apt::source( include apt::params - file { "${name}.list": - name => "${apt::params::root}/sources.list.d/${name}.list", + path => "${apt::params::root}/sources.list.d/${name}.list", ensure => file, owner => root, group => root, mode => 644, content => template("apt/source.list.erb"), + } if $pin != false { @@ -44,13 +44,14 @@ define apt::source( if $key != false { if $key_content { - exec { "Add key: ${key} from content": + exec { "Add key: ${key} from content for ${name}": command => "/bin/echo '${key_content}' | /usr/bin/apt-key add -", unless => "/usr/bin/apt-key list | /bin/grep '${key}'", before => File["${name}.list"], - } + } } else { - exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}": + exec { "Add key: ${key} from ${key_server} for ${name}": + command => "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}", unless => "/usr/bin/apt-key list | /bin/grep ${key}", before => File["${name}.list"], }