onlyif doesn't exist for files, fall back to less elegant solution

[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 fa3784c63821747be582a1a69e85252926cad02a..6d9f8a491ffad045eb6fe5ce5623385343b032e1 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -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,10 +60,14 @@ class debian-org {
                ensure => installed,
        }
 
-       if $::lsbmajdistrelease >= 7 {
+       if $::lsbmajdistrelease == 7 {
                package { 'libfilesystem-ruby1.9.1':
                        ensure => installed,
                }
+       } elsif $::lsbmajdistrelease >= 8 {
+               package { 'ruby-filesystem':
+                       ensure => installed,
+               }
        }
 
        munin::check { [
@@ -138,18 +150,18 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson]) or
-          ($::hoster in [bytemark]) {
-               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, 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,
@@ -157,10 +169,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',
@@ -219,6 +236,18 @@ class debian-org {
        file { '/etc/default/puppet':
                source => 'puppet:///modules/debian-org/puppet.default',
        }
+       file { '/etc/systemd':
+               ensure  => directory,
+       }
+       file { '/etc/systemd/system':
+               ensure  => directory,
+       }
+        file { '/etc/systemd/system/puppet.service':
+               ensure => 'link',
+               target => '/dev/null',
+               notify => Exec['systemctl daemon-reload'],
+       }
+
        file { '/etc/cron.d/dsa-puppet-stuff':
                source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
                require => Package['debian.org'],
@@ -238,7 +267,7 @@ class debian-org {
        file { '/etc/rc.local':
                mode   => '0755',
                source => 'puppet:///modules/debian-org/rc.local',
-               notify => Exec['rc.local start'],
+               notify => Exec['service rc.local start'],
        }
        file { '/etc/dsa':
                ensure => directory,
@@ -292,18 +321,21 @@ class debian-org {
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',
                refreshonly => true
        }
-       exec { 'puppetmaster restart':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service puppetmaster restart':
                refreshonly => true
        }
-       exec { 'rc.local start':
-               path        => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+       exec { 'service rc.local start':
                refreshonly => true
        }
        exec { 'init q':
                refreshonly => true
        }
 
+       exec { 'systemctl daemon-reload':
+               refreshonly => true,
+               onlyif  => "test -x /bin/systemctl"
+       }
+
        tidy { '/var/lib/puppet/clientbucket/':
                age      => '2w',
                recurse  => 9,