Make sure we do not have apt-listchanges

[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 81373f75f25a4069ddb6f0ce94937d3626573d65..ca473801554380a0a0f8c18d461c60180e6a3129 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -28,6 +28,7 @@ class debian-org {
                        'sysklogd',
                        'rsyslog',
                        'os-prober',
+                       'apt-listchanges',
                ]:
                ensure => purged,
        }
@@ -38,6 +39,12 @@ class debian-org {
                ensure => installed,
                tag    => extra_repo,
        }
+       file { '/etc/ssh/ssh_known_hosts':
+               ensure  => present,
+               replace => false,
+               mode    => '0644',
+               source  => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
+       }
 
        package { [
                        'apt-utils',
@@ -139,18 +146,18 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson]) or
-          ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
-               site::aptrepo { 'proposed-updates':
-                       url        => $mirror,
-                       suite      => "${::lsbdistcodename}-proposed-updates",
-                       components => ['main','contrib','non-free']
-               }
-       } else {
+       #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson]) or
+       #   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
+       #       site::aptrepo { 'proposed-updates':
+       #               url        => $mirror,
+       #               suite      => "${::lsbdistcodename}-proposed-updates",
+       #               components => ['main','contrib','non-free']
+       #       }
+       #} else {
                site::aptrepo { 'proposed-updates':
                        ensure => absent,
                }
-       }
+       #}
 
        site::aptrepo { 'debian.org':
                ensure => absent,
@@ -158,10 +165,15 @@ class debian-org {
 
        site::aptrepo { 'db.debian.org':
                url        => 'http://db.debian.org/debian-admin',
-               suite      => 'lenny',
+               suite      => 'debian-all',
                components => 'main',
                key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
        }
+       site::aptrepo { 'db.debian.org-suite':
+               url        => 'http://db.debian.org/debian-admin',
+               suite      => $::lsbdistcodename,
+               components => 'main',
+       }
 
        augeas { 'inittab_replicate':
                context => '/files/etc/inittab',