} 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
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 { [
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",
file { '/etc/default/puppet':
source => 'puppet:///modules/debian-org/puppet.default',
}
+ file { '/etc/systemd/system':
+ ensure => directory,
+ recurse => true,
+ }
+ 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'],
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 { 'service rc.local start':
refreshonly => true
}
+ exec { 'systemctl daemon-reload':
+ refreshonly => true,
+ onlyif => "test -x /bin/systemctl"
+ }
+
tidy { '/var/lib/puppet/clientbucket/':
age => '2w',
recurse => 9,