if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
} else {
- $mirror = 'http://http.debian.net/debian/'
+ $mirror = 'http://ftp.debian.org/debian/'
}
- if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
} else {
$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'
+ }
+
$debianadmin = [
'debian-archive-debian-samhain-reports@master.debian.org',
'debian-admin@ftbfs.de',
ensure => installed,
}
- if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
+ if $::lsbmajdistrelease == 7 {
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
+ } elsif $::lsbmajdistrelease >= 8 {
+ package { 'ruby-filesystem':
+ ensure => installed,
+ }
}
munin::check { [
site::aptrepo { 'security':
url => 'http://security.debian.org/',
- suite => "${::lsbdistcodename}/updates",
+ suite => "${mungedcodename}/updates",
components => ['main','contrib','non-free']
}
- if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease < 7 {
site::aptrepo { 'debian-lts':
url => $mirror,
suite => "${::lsbdistcodename}-lts",
components => ['main','contrib','non-free']
}
- site::aptrepo { 'volatile':
- url => $mirror,
- suite => "${::lsbdistcodename}-updates",
- components => ['main','contrib','non-free']
+ if (($::lsbmajdistrelease) >= 8 and ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386'])) {
+ site::aptrepo { 'volatile':
+ ensure => absent,
+ }
+ } else {
+ site::aptrepo { 'volatile':
+ url => $mirror,
+ suite => "${::lsbdistcodename}-updates",
+ components => ['main','contrib','non-free']
+ }
}
#if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
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']
}
}
file { '/etc/default/puppet':
source => 'puppet:///modules/debian-org/puppet.default',
}
+ file { '/etc/systemd':
+ ensure => directory,
+ mode => 0755,
+ }
+ file { '/etc/systemd/system':
+ ensure => directory,
+ mode => 0755,
+ }
+ file { '/etc/systemd/system/ud-replicated.service':
+ ensure => $servicefiles,
+ 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',
+ notify => Exec['systemctl daemon-reload'],
+ }
+
file { '/etc/cron.d/dsa-puppet-stuff':
- source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+ content => template('debian-org/dsa-puppet-stuff.cron.erb'),
require => Package['debian.org'],
}
file { '/etc/ldap/ldap.conf':
}
file { '/etc/rc.local':
mode => '0755',
- source => 'puppet:///modules/debian-org/rc.local',
- notify => Exec['rc.local start'],
+ content => template('debian-org/rc.local.erb'),
+ notify => Exec['service rc.local start'],
}
file { '/etc/dsa':
ensure => directory,
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,