install virt-what and use facter's default virtual facts

[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 6cb629e..eb0c425 100644 (file)
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -12,6 +12,13 @@ class debian_org {
                $servicefiles = 'absent'
        }
 
+       # the virtual facter needs virt-what on jessie to work
+       if versioncmp($::lsbmajdistrelease, '9') < 0 {
+               package { 'virt-what': ensure => installed }
+       } else {
+               package { 'virt-what': ensure => purged }
+       }
+
        $debianadmin = [
                'debian-archive-debian-samhain-reports@master.debian.org',
                'debian-admin@ftbfs.de',
@@ -26,6 +33,7 @@ class debian_org {
                        'rsyslog',
                        'os-prober',
                        'apt-listchanges',
+                       'mlocate',
                ]:
                ensure => purged,
        }
@@ -43,7 +51,7 @@ class debian_org {
                source  => 'puppet:///modules/debian_org/basic-ssh_known_hosts'
        }
 
-       if ($::lsbmajdistrelease >= '8') {
+       if versioncmp($::lsbmajdistrelease, '8') >= 0 {
                $rubyfs_package = 'ruby-filesystem'
        } else {
                $rubyfs_package = 'libfilesystem-ruby1.9'
@@ -136,7 +144,7 @@ class debian_org {
        }
        file { '/etc/puppet/puppet.conf':
                content => template('debian_org/puppet.conf.erb'),
-               mode => 0440,
+               mode => '0440',
                group => 'puppet',
        }
        file { '/etc/default/puppet':
@@ -144,11 +152,11 @@ class debian_org {
        }
        file { '/etc/systemd':
                ensure  => directory,
-               mode => 0755,
+               mode => '0755',
        }
        file { '/etc/systemd/system':
                ensure  => directory,
-               mode => 0755,
+               mode => '0755',
        }
        file { '/etc/systemd/system/ud-replicated.service':
                ensure => $servicefiles,
@@ -250,6 +258,10 @@ class debian_org {
                owner  => root,
                group  => root,
        }
+       file { '/usr/local/bin/dsa-is-shutdown-scheduled':
+               source  => 'puppet:///modules/debian_org/dsa-is-shutdown-scheduled',
+               mode    => '0555',
+       }
 
        exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
                path        => '/usr/bin:/usr/sbin:/bin:/sbin',