define apt::source(
$location = '',
- $release = 'karmic',
+ $release = $lsbdistcodename,
$repos = 'main',
$include_src = true,
$required_packages = false,
$key = false,
$key_server = 'keyserver.ubuntu.com',
- $pin = false,
- $key_content = false
+ $key_content = false,
+ $key_source = false,
+ $pin = false
) {
include apt::params
+ if $release == undef {
+ fail("lsbdistcodename fact not available: release parameter required")
+ }
+
file { "${name}.list":
path => "${apt::params::root}/sources.list.d/${name}.list",
ensure => file,
group => root,
mode => 644,
content => template("apt/source.list.erb"),
-
}
if $pin != false {
}
if $required_packages != false {
- exec { "${apt::params::provider} -y install ${required_packages}":
- subscribe => File["${name}.list"],
+ exec { "Required packages: '${required_packages}' for ${name}":
+ command => "${apt::params::provider} -y install ${required_packages}",
+ subscribe => File["${name}.list"],
refreshonly => true,
}
}
if $key != false {
- if $key_content {
- exec { "Add key: ${key} from content":
- 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}":
- unless => "/usr/bin/apt-key list | /bin/grep ${key}",
- before => File["${name}.list"],
- }
+ apt::key { "Add key: ${key} from Apt::Source ${title}":
+ key => $key,
+ ensure => present,
+ key_server => $key_server,
+ key_content => $key_content,
+ key_source => $key_source,
+ before => File["${name}.list"],
}
}
}