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 < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
$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',
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']
}
- 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,
- recurse => true,
+ 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':
+ 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',
+ content => template('debian-org/rc.local.erb'),
notify => Exec['service rc.local start'],
}
file { '/etc/dsa':