X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Faptrepo.pp;fp=modules%2Fsite%2Fmanifests%2Faptrepo.pp;h=d0e34ecaf8dddfcb6145725186f4013a8b93d817;hb=7abe65323c6bf5909c19fa7766af23048559c79d;hp=b71c5fa25c3f4289a81b889c8767de97a7cbc971;hpb=382b96856d6c214d79ae17d7f3b919ed7ae99bf8;p=dsa-puppet.git

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index b71c5fa2..d0e34eca 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,18 +1,17 @@
-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 {
 		present: {
 			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',
-					stage  => setup,
 					notify => Exec["apt-key-update-${name}"]
 				}
 			}
@@ -21,23 +20,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,
-					stage  => setup,
 					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,
-					stage  => setup,
 				}
 			} elsif $keyid {
 				exec { "apt-key-del-${keyid}":
-					command => "apt-key del ${keyid}",
-					stage   => setup,
+					command     => "apt-key del ${keyid}",
 				}
 			}
 		}
@@ -54,13 +49,15 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
 		file { "/etc/apt/sources.list.d/${name}.list":
 			ensure  => $ensure,
 			content => template($template),
-			notify  => Exec['apt-get update'],
+			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'],
+			ensure => $ensure,
+			source => $config,
+			notify => Exec['apt-get update'],
+			require => $require,
 		}
 	}
 }