Make it work with jessie, II

[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 e19be7f83d1310c9ca75a1d10c062288551ad384..f441ac51f6f00faf2e234bba5872afa107288252 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -8,7 +8,7 @@ class debian-org {
        } else {
                $mirror = 'http://http.debian.net/debian/'
        }
-       if $::lsbmajdistrelease < 7 {
+       if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
                $mirror_backports = 'http://backports.debian.org/debian-backports/'
        } else {
                $mirror_backports = $mirror
@@ -27,6 +27,8 @@ class debian-org {
                        'klogd',
                        'sysklogd',
                        'rsyslog',
+                       'os-prober',
+                       'apt-listchanges',
                ]:
                ensure => purged,
        }
@@ -37,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',
@@ -52,7 +60,7 @@ class debian-org {
                ensure => installed,
        }
 
-       if $::lsbmajdistrelease >= 7 {
+       if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
                package { 'libfilesystem-ruby1.9.1':
                        ensure => installed,
                }
@@ -99,22 +107,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 != "testing" and $::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,
@@ -122,13 +146,18 @@ 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, 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':
-                       url        => $mirror,
-                       suite      => "${::lsbdistcodename}-proposed-updates",
-                       components => ['main','contrib','non-free']
+                       ensure => absent,
                }
-       }
+       #}
 
        site::aptrepo { 'debian.org':
                ensure => absent,
@@ -136,9 +165,14 @@ 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',
-               key        => 'puppet:///modules/debian-org/db.debian.org.asc',
        }
 
        augeas { 'inittab_replicate':
@@ -175,10 +209,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',
        }
@@ -294,4 +324,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',
+       }
 }