projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
schroot does not depend on the db.d.o repository. do not put schroot on hold for...
[mirror/dsa-puppet.git]
/
modules
/
site
/
manifests
/
aptrepo.pp
diff --git
a/modules/site/manifests/aptrepo.pp
b/modules/site/manifests/aptrepo.pp
index
b71c5fa
..
d5bae78
100644
(file)
--- a/
modules/site/manifests/aptrepo.pp
+++ b/
modules/site/manifests/aptrepo.pp
@@
-5,14
+5,12
@@
define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
if $key {
exec { "apt-key-update-${name}":
command => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
if $key {
exec { "apt-key-update-${name}":
command => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
- stage => setup,
refreshonly => true,
}
file { "/etc/apt/trusted-keys.d/${name}.asc":
source => $key,
mode => '0664',
refreshonly => true,
}
file { "/etc/apt/trusted-keys.d/${name}.asc":
source => $key,
mode => '0664',
- stage => setup,
notify => Exec["apt-key-update-${name}"]
}
}
notify => Exec["apt-key-update-${name}"]
}
}
@@
-21,23
+19,19
@@
define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
if ($keyid) and ($key) {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
if ($keyid) and ($key) {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
- stage => setup,
notify => Exec["apt-key-del-${keyid}"]
}
exec { "apt-key-del-${keyid}":
command => "apt-key del ${keyid}",
notify => Exec["apt-key-del-${keyid}"]
}
exec { "apt-key-del-${keyid}":
command => "apt-key del ${keyid}",
- stage => setup,
refreshonly => true,
}
} elsif $key {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
refreshonly => true,
}
} elsif $key {
file { "/etc/apt/trusted-keys.d/${name}.asc":
ensure => absent,
- stage => setup,
}
} elsif $keyid {
exec { "apt-key-del-${keyid}":
}
} elsif $keyid {
exec { "apt-key-del-${keyid}":
- command => "apt-key del ${keyid}",
- stage => setup,
+ command => "apt-key del ${keyid}",
}
}
}
}
}
}
@@
-54,13
+48,13
@@
define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure,
content => template($template),
file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure,
content => template($template),
- notify
=> Exec['apt-get update'],
+ notify => Exec['apt-get update'],
}
} else {
file { "/etc/apt/sources.list.d/${name}.list":
}
} else {
file { "/etc/apt/sources.list.d/${name}.list":
- ensure
=> $ensure,
- source
=> $config,
- notify
=> Exec['apt-get update'],
+ ensure => $ensure,
+ source => $config,
+ notify => Exec['apt-get update'],
}
}
}
}
}
}