pettersson gets proposed-updates for now

[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..cb86848a94217b32b8019a525191abf831eae931 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,22 +99,38 @@ 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",
                components => ['main','contrib','non-free']
        }
+       if $::lsbmajdistrelease < 7 {
+               site::aptrepo { 'debian-lts':
+                       url        => $mirror,
+                       suite      => "${::lsbdistcodename}-lts",
+                       components => ['main','contrib','non-free']
+               }
+       } else {
+               site::aptrepo { 'debian-lts':
+                       ensure => absent,
+               }
+       }
 
        site::aptrepo { 'backports.debian.org':
                url        => $mirror_backports,
                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,
@@ -118,7 +138,7 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+       if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson] {
                site::aptrepo { 'proposed-updates':
                        url        => $mirror,
                        suite      => "${::lsbdistcodename}-proposed-updates",
@@ -134,7 +154,17 @@ 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':
+               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') {
@@ -161,10 +191,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',
        }
@@ -280,4 +306,17 @@ class debian-org {
                matches  => [ 'paths', 'contents' ],
                schedule => weekly
        }
+
+       file { '/root/.bashrc':
+               source => 'puppet:///modules/debian-org/root-dotfiles/bashrc',
+       }
+       file { '/root/.profile':
+               source => 'puppet:///modules/debian-org/root-dotfiles/profile',
+       }
+       file { '/root/.screenrc':
+               source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
+       }
+       file { '/root/.vimrc':
+               source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
+       }
 }