$mirror_backports = $mirror
}
+ if $::lsbmajdistrelease <= 7 {
+ $mungedcodename = $::lsbdistcodename
+ } elsif ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+ $mungedcodename = "${::lsbdistcodename}-kfreebsd"
+ } else {
+ $mungedcodename = $::lsbdistcodename
+ }
+
if $systemd {
+ include systemd
$servicefiles = 'present'
} else {
$servicefiles = 'absent'
source => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
}
+ if ($::lsbmajdistrelease >= 8) {
+ $rubyfs_package = 'ruby-filesystem'
+ } elsif $::lsbmajdistrelease == 7 {
+ $rubyfs_package = 'libfilesystem-ruby1.9'
+ } else {
+ $rubyfs_package = 'libfilesystem-ruby1.8'
+ }
package { [
'apt-utils',
'bash-completion',
'dnsutils',
'less',
'lsb-release',
- 'libfilesystem-ruby1.8',
+ $rubyfs_package,
'mtr-tiny',
'nload',
'pciutils',
ensure => installed,
}
- if $::lsbmajdistrelease == 7 {
- package { 'libfilesystem-ruby1.9.1':
- ensure => installed,
- }
- } elsif $::lsbmajdistrelease >= 8 {
- package { 'ruby-filesystem':
- ensure => installed,
- }
- }
-
munin::check { [
'cpu',
'entropy',
site::aptrepo { 'security':
url => 'http://security.debian.org/',
- suite => "${::lsbdistcodename}/updates",
+ suite => "${mungedcodename}/updates",
components => ['main','contrib','non-free']
}
if $::lsbmajdistrelease < 7 {
components => ['main','contrib','non-free']
}
- #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
+ #if ($::hostname in [corelli, lucatelli, mayr, pettersson]) or
# ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
# site::aptrepo { 'proposed-updates':
# url => $mirror,
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
site::aptrepo { 'debian':
url => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
- suite => $::lsbdistcodename,
+ suite => $mungedcodename,
components => ['main','contrib','non-free']
}
}
source => 'puppet:///modules/debian-org/ud-replicated.service',
notify => Exec['systemctl daemon-reload'],
}
+ if $systemd {
+ file { '/etc/systemd/system/multi-user.target.wants/ud-replicated.service':
+ ensure => 'link',
+ target => '../ud-replicated.service',
+ notify => Exec['systemctl daemon-reload'],
+ }
+ }
file { '/etc/systemd/system/puppet.service':
ensure => 'link',
target => '/dev/null',
}
file { '/etc/ldap/ldap.conf':
require => Package['debian.org'],
- source => 'puppet:///modules/debian-org/ldap.conf',
+ content => template('debian-org/ldap.conf.erb'),
}
file { '/etc/pam.d/common-session':
require => Package['debian.org'],
}
file { '/etc/rc.local':
mode => '0755',
- source => 'puppet:///modules/debian-org/rc.local',
+ content => template('debian-org/rc.local.erb'),
notify => Exec['service rc.local start'],
}
file { '/etc/dsa':
onlyif => "test -x /bin/systemctl"
}
+ exec { 'systemd-tmpfiles --create --exclude-prefix=/dev':
+ refreshonly => true,
+ onlyif => "test -x /bin/systemd-tmpfiles"
+ }
+
tidy { '/var/lib/puppet/clientbucket/':
age => '2w',
recurse => 9,