From: Peter Palfrader Date: Fri, 27 Apr 2012 18:08:43 +0000 (+0200) Subject: What about now X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e3c7ba19631d0ae3007879027a8cdde5fb4e4250;p=mirror%2Fdsa-puppet.git What about now --- diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp index 0cb8152b6..1de4f3377 100644 --- a/modules/buildd/manifests/init.pp +++ b/modules/buildd/manifests/init.pp @@ -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': diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp index ae66d6f21..d0e34ecaf 100644 --- a/modules/site/manifests/aptrepo.pp +++ b/modules/site/manifests/aptrepo.pp @@ -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, } } }