Merge branch 'master' of ssh://handel.debian.org/~/dsa-puppet

diff --git a/modules/debian-org/files/backports.org.asc b/modules/debian-org/files/backports.org.asc
deleted file mode 100644 (file)
index 335513c..0000000
--- a/modules/debian-org/files/backports.org.asc
+++ /dev/null
@@ -1,40 +0,0 @@
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-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
-AJ4v9ojJnvJu2yUl4W586soBm+wsLg==
-=n4L0
------END PGP PUBLIC KEY BLOCK-----

diff --git a/modules/debian-org/files/db.debian.org.asc b/modules/debian-org/files/db.debian.org.asc
index 80a9f02..ab26152 100644 (file)
--- a/modules/debian-org/files/db.debian.org.asc
+++ b/modules/debian-org/files/db.debian.org.asc
@@ -1,7 +1,7 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
 mQGiBEf4BP0RBACfXnRhBb9HKiA3h5A1tDnluVwfkSuDX4ZXdVAuMZapdOm8r9ug
 9zE/dDGWPWja+DArAPZ/i3BFvlMewmden/IFbQKtXluQVIC4GL1RBMwrtWsZzo0g
@@ -13,7 +13,7 @@ VvC0A/9nT/k6VIFBF0Oq2WwmzOLptOqg61WrnxBr3GIe503++p88tOwlCJlL0uZZ
 k68m3m5t7WDtQK4fHQwLramb9AqtBPhiEaXU5bXk77RYE54EeEH9Z4H4YSMMkdYU
 gLG5CZI2jprxAZew1mHKROv+15jxYd+BZCrORmpWn5g7N+TC5rQeZGIuZGViaWFu
 Lm9yZyBhcmNoaXZlIGtleSAyMDA4iGYEExECACYCGwMGCwkIBwMCBBUCCAMEFgID
-AQIeAQIXgAUCS7uHvAUJB4XptQAKCRC+p88QvSsO4EsWAJsHsiccMVwWatQWuk2G
-M3MdAZLDCwCfYma5XoZnyFv27h5LxGo+57xU44Y=
-=2WKp
+AQIeAQIXgAUCT4AM/gUJC0pu7gAKCRC+p88QvSsO4KcGAKCCMehYEKkgFQ5yzzLs
+OSYtvPlLLQCgmUybuUPhd5dzeSL7AA2N666p5Sc=
+=jdsl
 -----END PGP PUBLIC KEY BLOCK-----

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 47ea1a9..369aade 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -64,14 +64,18 @@ class debian-org {
                site::aptrepo { 'security':
                        template => 'debian-org/etc/apt/sources.list.d/security.list.erb',
                }
-               site::aptrepo { 'backports.org':
-                       template => 'debian-org/etc/apt/sources.list.d/backports.org.list.erb',
-                       key      => 'puppet:///modules/debian-org/backports.org.asc',
+               site::aptrepo { 'backports.debian.org':
+                       template => 'debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb',
                }
                site::aptrepo { 'volatile':
                        template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
                }
        }
+       site::aptrepo { 'backports.org':
+               ensure => absent,
+               keyid => '16BA136C',
+               key => 'puppet:///modules/debian-org/backports.org.asc',
+       }
 
        site::aptrepo { 'debian.org':
                ensure => absent,

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/backports.debian.org.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/backports.debian.org.list.erb
new file mode 100644 (file)
index 0000000..53485d1
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/backports.debian.org.list.erb
@@ -0,0 +1,10 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+<% if lsbdistcodename == 'lenny' %>
+deb     http://archive.debian.org/debian-backports/     lenny-backports main contrib non-free
+<% elsif lsbdistcodename != 'n/a' %>
+deb    http://backports.debian.org/debian-backports/   <%= lsbdistcodename %>-backports main contrib non-free
+<% end %>

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
deleted file mode 100644 (file)
index 53485d1..0000000
--- a/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-<% if lsbdistcodename == 'lenny' %>
-deb     http://archive.debian.org/debian-backports/     lenny-backports main contrib non-free
-<% elsif lsbdistcodename != 'n/a' %>
-deb    http://backports.debian.org/debian-backports/   <%= lsbdistcodename %>-backports main contrib non-free
-<% end %>

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index 79d1a59..ae66d6f 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,21 +1,41 @@
-define site::aptrepo ($key = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $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}"]
-               }
-       }
 
        case $ensure {
-               present: {}
-               absent:  {}
+               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}"]
+                               }
+                       }
+               }
+               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'" ) }
        }