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 d461807af79a14af447f51162da33b2ad959e8b2..db6179f10ca01633a0718708cc0fa1c20e6c334a 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,39 +1,62 @@
-define site::aptrepo ($key = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo (
+       $url='',
+       $suite='',
+       $components=[],
+       $key = undef,
+       $keyid = undef,
+       $ensure = present
+) {
 
-       if $key {
-               exec { "apt-key-update-${name}":
-                       command     => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
-                       refreshonly => true,
-               }
+       case $ensure {
+               present: {
+                       if $key {
+                               exec { "apt-key-update-${name}":
+                                       command     => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
+                                       refreshonly => true,
+                               }
 
-               file { "/etc/apt/trusted-keys.d/${name}.asc":
-                       source => $key,
-                       mode   => '0664',
-                       notify => Exec["apt-key-update-${name}"]
+                               file { "/etc/apt/trusted-keys.d/${name}.asc":
+                                       source => $key,
+                                       mode   => '0664',
+                                       notify => Exec["apt-key-update-${name}"]
+                               }
+                       }
                }
+               absent:  {
+                       if ($keyid) and ($key) {
+                               file { "/etc/apt/trusted-keys.d/${name}.asc":
+                                       ensure => absent,
+                                       notify => Exec["apt-key-del-${keyid}"]
+                               }
+                               exec { "apt-key-del-${keyid}":
+                                       command     => "apt-key del ${keyid}",
+                                       refreshonly => true,
+                               }
+                       } elsif $key {
+                               file { "/etc/apt/trusted-keys.d/${name}.asc":
+                                       ensure => absent,
+                               }
+                       } elsif $keyid {
+                               exec { "apt-key-del-${keyid}":
+                                       command     => "apt-key del ${keyid}",
+                               }
+                       }
+               }
+               default: { fail ( "Unknown ensure value: '$ensure'" ) }
        }
 
        case $ensure {
-               present: {}
-               absent:  {}
-               default: { err ( "Unknown ensure value: '$ensure'" ) }
-       }
-
-       if ! ($template or $config) {
-               err ( "Can't find configuration for ${name}" )
+               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),
-                       notify => Exec['apt-get update'],
-               }
-       } else {
-               file { "/etc/apt/sources.list.d/${name}.list":
-                       ensure => $ensure,
-                       source => $config,
-                       notify => Exec['apt-get update'],
-               }
+                       content => template('site/aptrepo.erb'),
+                       notify  => Exec['apt-get update'],
        }
 }