Switch to /etc/apt/trusted.gpg.d

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 1d8c8e78967775d666941f7f2fbc7324cf151565..4417bfd5785b953106aea900d4e0d5b202a26c22 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -1,3 +1,7 @@
+# == Class: debian-org
+#
+# Stuff common to all debian.org servers
+#
 class debian-org {
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
                $mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
@@ -95,6 +99,13 @@ class debian-org {
                require => Package['molly-guard'],
        }
 
+       file { '/etc/apt/trusted-keys.d':
+               ensure => absent,
+       }
+       file { '/etc/apt/trusted.gpg',
+               mode    => '0600',
+               content => "",
+       }
        site::aptrepo { 'security':
                url        => 'http://security.debian.org/',
                suite      => "${::lsbdistcodename}/updates",
@@ -106,11 +117,6 @@ class debian-org {
                suite      => "${::lsbdistcodename}-backports",
                components => ['main','contrib','non-free']
        }
-       site::aptrepo { 'backports.org':
-               ensure => absent,
-               keyid  => '16BA136C',
-               key    => 'puppet:///modules/debian-org/backports.org.asc',
-       }
 
        site::aptrepo { 'volatile':
                url        => $mirror,
@@ -137,6 +143,16 @@ class debian-org {
                key        => 'puppet:///modules/debian-org/db.debian.org.asc',
        }
 
+       augeas { 'inittab_replicate':
+               context => '/files/etc/inittab',
+               changes => [
+                       'set ud/runlevels 2345',
+                       'set ud/action respawn',
+                       'set ud/process "/usr/bin/ud-replicated -d"',
+               ],
+               notify  => Exec['init q'],
+       }
+
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
                site::aptrepo { 'debian':
                        url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),