Revert "try to order these a bit"

[mirror/dsa-puppet.git] / modules / site / manifests / aptrepo.pp

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index b71c5fa..d0e34ec 100644 (file)
--- 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,
                }
        }
 }