projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow access to dak's DB on bmbl1 from ubc
[mirror/dsa-puppet.git]
/
modules
/
site
/
manifests
/
aptrepo.pp
diff --git
a/modules/site/manifests/aptrepo.pp
b/modules/site/manifests/aptrepo.pp
index
c97fade
..
e53de75
100644
(file)
--- a/
modules/site/manifests/aptrepo.pp
+++ b/
modules/site/manifests/aptrepo.pp
@@
-1,6
+1,6
@@
define site::aptrepo (
define site::aptrepo (
- $url,
- $suite,
+ $url
=''
,
+ $suite
=''
,
$components=[],
$key = undef,
$keyid = undef,
$components=[],
$key = undef,
$keyid = undef,
@@
-45,9
+45,18
@@
define site::aptrepo (
default: { fail ( "Unknown ensure value: '$ensure'" ) }
}
default: { fail ( "Unknown ensure value: '$ensure'" ) }
}
+ case $ensure {
+ present: {
+ if !($url and $suite) {
+ fail ( "Need both url and suite for $name" )
+ }
+ }
+ default: {}
+ }
+
file { "/etc/apt/sources.list.d/${name}.list":
file { "/etc/apt/sources.list.d/${name}.list":
-
ensure => $ensure,
-
content => template('site/aptrepo.erb'),
-
notify
=> Exec['apt-get update'],
+ ensure => $ensure,
+ content => template('site/aptrepo.erb'),
+
notify
=> Exec['apt-get update'],
}
}
}
}