-define site::aptrepo ($key = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo (
+ $url='',
+ $suite='',
+ $components=[],
+ $key = undef,
+ $ensure = present
+) {
- if $key {
- exec { "apt-key-update-${name}":
- command => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
- refreshonly => true,
+ case $ensure {
+ present: {
+ if $key {
+ file { "/etc/apt/trusted.gpg.d/${name}.gpg":
+ source => $key,
+ mode => '0664',
+ }
+ }
}
-
- file { "/etc/apt/trusted-keys.d/${name}.asc":
- source => $key,
- mode => '0664',
- notify => Exec["apt-key-update-${name}"]
+ absent: {
+ if $key {
+ file { "/etc/apt/trusted.gpg.d/${name}.gpg":
+ ensure => absent,
+ }
+ }
}
- }
-
- case $ensure {
- present: {}
- absent: {}
default: { fail ( "Unknown ensure value: '$ensure'" ) }
}
- if $ensure == present {
- if ! ($config or $template) {
- fail ( "No configuration found for ${name}" )
+ case $ensure {
+ present: {
+ if !($url and $suite) {
+ fail ( "Need both url and suite for $name" )
+ }
}
+ default: {}
}
- if $template {
- file { "/etc/apt/sources.list.d/${name}.list":
- ensure => $ensure,
- content => template($template),
- notify => Exec['apt-get update'],
- }
- } else {
- file { "/etc/apt/sources.list.d/${name}.list":
- ensure => $ensure,
- source => $config,
- notify => Exec['apt-get update'],
- }
+ file { "/etc/apt/sources.list.d/${name}.list":
+ ensure => $ensure,
+ content => template('site/aptrepo.erb'),
+ notify => Exec['apt-get update'],
}
}