projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix modes for hooks
[mirror/dsa-puppet.git]
/
modules
/
site
/
manifests
/
aptrepo.pp
diff --git
a/modules/site/manifests/aptrepo.pp
b/modules/site/manifests/aptrepo.pp
index
ae66d6f
..
52036ed
100644
(file)
--- a/
modules/site/manifests/aptrepo.pp
+++ b/
modules/site/manifests/aptrepo.pp
@@
-1,5
+1,11
@@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
-
+define site::aptrepo (
+ $url='',
+ $suite='',
+ $components=[],
+ $key = undef,
+ $keyid = undef,
+ $ensure = present
+) {
case $ensure {
present: {
case $ensure {
present: {
@@
-39,23
+45,18
@@
define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
default: { fail ( "Unknown ensure value: '$ensure'" ) }
}
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":
+ file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure,
ensure => $ensure,
- content => template(
$template
),
+ content => template(
'site/aptrepo.erb'
),
notify => Exec['apt-get update'],
notify => Exec['apt-get update'],
- }
- } else {
- file { "/etc/apt/sources.list.d/${name}.list":
- ensure => $ensure,
- source => $config,
- notify => Exec['apt-get update'],
- }
}
}
}
}