What about now
authorPeter Palfrader <peter@palfrader.org>
Fri, 27 Apr 2012 18:08:43 +0000 (20:08 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 27 Apr 2012 18:09:14 +0000 (20:09 +0200)
modules/buildd/manifests/init.pp
modules/site/manifests/aptrepo.pp

index 0cb8152..1de4f33 100644 (file)
@@ -25,7 +25,7 @@ class buildd {
        site::aptrepo { 'buildd.debian.org':
                template => 'buildd/etc/apt/sources.list.d/buildd.list.erb',
                key      => 'puppet:///modules/buildd/buildd.debian.org.asc',
-               require => Package['apt-transport-https'],
+               require  => Package['apt-transport-https'],
        }
 
        file { '/etc/apt/preferences.d/buildd':
index ae66d6f..d0e34ec 100644 (file)
@@ -1,4 +1,4 @@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present, $require = []) {
 
 
        case $ensure {
@@ -50,12 +50,14 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
                        ensure  => $ensure,
                        content => template($template),
                        notify => Exec['apt-get update'],
+                       require => $require,
                }
        } else {
                file { "/etc/apt/sources.list.d/${name}.list":
                        ensure => $ensure,
                        source => $config,
                        notify => Exec['apt-get update'],
+                       require => $require,
                }
        }
 }