clean up aptrepo ordering

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

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index b71c5fa25c3f4289a81b889c8767de97a7cbc971..db6179f10ca01633a0718708cc0fa1c20e6c334a 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,18 +1,23 @@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo (
+       $url='',
+       $suite='',
+       $components=[],
+       $key = undef,
+       $keyid = 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}"]
                                }
                        }
@@ -21,46 +26,37 @@ 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}",
                                }
                        }
                }
                default: { fail ( "Unknown ensure value: '$ensure'" ) }
        }
 
-       if $ensure == present {
-               if ! ($config or $template) {
-                       fail ( "No configuration found for ${name}" )
+       case $ensure {
+               present: {
+                       if !($url and $suite) {
+                               fail ( "Need both url and suite for $name" )
+                       }
                }
+               default: {}
        }
 
-       if $template {
-               file { "/etc/apt/sources.list.d/${name}.list":
+       file { "/etc/apt/sources.list.d/${name}.list":
                        ensure  => $ensure,
-                       content => template($template),
+                       content => template('site/aptrepo.erb'),
                        notify  => Exec['apt-get update'],
-               }
-       } else {
-               file { "/etc/apt/sources.list.d/${name}.list":
-                       ensure  => $ensure,
-                       source  => $config,
-                       notify  => Exec['apt-get update'],
-               }
        }
 }