Limit nfs firewall ports to certain ranges

[mirror/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 8264a30..053b61a 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,16 @@ class debian-org {
                require => Package['molly-guard'],
        }
 
+       file { '/etc/apt/trusted-keys.d':
+               ensure => absent,
+               force  => true,
+       }
+
+       file { '/etc/apt/trusted.gpg':
+               mode    => '0600',
+               content => "",
+       }
+
        site::aptrepo { 'security':
                url        => 'http://security.debian.org/',
                suite      => "${::lsbdistcodename}/updates",
@@ -106,11 +120,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,
@@ -134,7 +143,7 @@ class debian-org {
                url        => 'http://db.debian.org/debian-admin',
                suite      => 'lenny',
                components => 'main',
-               key        => 'puppet:///modules/debian-org/db.debian.org.asc',
+               key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
        }
 
        augeas { 'inittab_replicate':
@@ -142,9 +151,9 @@ class debian-org {
                changes => [
                        'set ud/runlevels 2345',
                        'set ud/action respawn',
-                       "set mo/process /usr/bin/ud-replicated",
+                       'set ud/process "/usr/bin/ud-replicated -d"',
                ],
-               notify => Exec['init q'],
+               notify  => Exec['init q'],
        }
 
        if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
@@ -171,10 +180,6 @@ class debian-org {
        file { '/etc/apt/preferences':
                source => 'puppet:///modules/debian-org/apt.preferences',
        }
-       file { '/etc/apt/trusted-keys.d/':
-               ensure => directory,
-               purge  => true,
-       }
        file { '/etc/apt/apt.conf.d/local-compression':
                source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
        }