try to order these a bit

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

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index ea1b9202da1e3d07a4c0d33cfe36e47af1647142..b71c5fa25c3f4289a81b889c8767de97a7cbc971 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,16 +1,18 @@
-define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '', $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
 
        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}"]
                                }
                        }
@@ -19,19 +21,23 @@ define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '',
                        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}",
+                                       command => "apt-key del ${keyid}",
+                                       stage   => setup,
                                }
                        }
                }
@@ -39,15 +45,22 @@ define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '',
        }
 
        if $ensure == present {
-               if ! ($source or $content) {
+               if ! ($config or $template) {
                        fail ( "No configuration found for ${name}" )
                }
        }
 
-       file { "/etc/apt/sources.list.d/${name}.list":
-               ensure  => $ensure,
-               content => $content,
-               source  => $source,
-               notify  => Exec['apt-get update'],
+       if $template {
+               file { "/etc/apt/sources.list.d/${name}.list":
+                       ensure  => $ensure,
+                       content => template($template),
+                       notify  => Exec['apt-get update'],
+               }
+       } else {
+               file { "/etc/apt/sources.list.d/${name}.list":
+                       ensure  => $ensure,
+                       source  => $config,
+                       notify  => Exec['apt-get update'],
+               }
        }
 }