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 1ef3e506f49dece3afa03fcfd9150e0d2ae92353..6d9f8a491ffad045eb6fe5ce5623385343b032e1 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 != "testing/unstable" and $::lsbmajdistrelease < 7 {
+       if $::lsbmajdistrelease < 7 {
                $mirror_backports = 'http://backports.debian.org/debian-backports/'
        } else {
                $mirror_backports = $mirror
@@ -60,10 +60,14 @@ class debian-org {
                ensure => installed,
        }
 
-       if $::lsbmajdistrelease == "testing/unstable" or $::lsbmajdistrelease >= 7 {
+       if $::lsbmajdistrelease == 7 {
                package { 'libfilesystem-ruby1.9.1':
                        ensure => installed,
                }
+       } elsif $::lsbmajdistrelease >= 8 {
+               package { 'ruby-filesystem':
+                       ensure => installed,
+               }
        }
 
        munin::check { [
@@ -122,7 +126,7 @@ class debian-org {
                suite      => "${::lsbdistcodename}/updates",
                components => ['main','contrib','non-free']
        }
-       if $::lsbmajdistrelease != "testing/unstable" and $::lsbmajdistrelease < 7 {
+       if $::lsbmajdistrelease < 7 {
                site::aptrepo { 'debian-lts':
                        url        => $mirror,
                        suite      => "${::lsbdistcodename}-lts",
@@ -232,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'],
@@ -315,6 +331,11 @@ class debian-org {
                refreshonly => true
        }
 
+       exec { 'systemctl daemon-reload':
+               refreshonly => true,
+               onlyif  => "test -x /bin/systemctl"
+       }
+
        tidy { '/var/lib/puppet/clientbucket/':
                age      => '2w',
                recurse  => 9,