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 <= 8 {
+ $mirror = 'http://cdn-fastly.deb.debian.org/debian/'
+ } else {
+ $mirror = 'http://deb.debian.org/debian/'
+ }
}
- if $::lsbmajdistrelease != "testing/unstable" and $::lsbmajdistrelease < 7 {
- $mirror_backports = 'http://backports.debian.org/debian-backports/'
+
+ 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 {
- $mirror_backports = $mirror
+ $servicefiles = 'absent'
}
$debianadmin = [
'weasel@debian.org',
'steve@lobefin.net',
'paravoid@debian.org',
- 'zumbi@kos.to'
+ 'zumbi@oron.es'
]
package { [
source => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
}
+ if ($::lsbmajdistrelease >= 8) {
+ $rubyfs_package = 'ruby-filesystem'
+ } else {
+ $rubyfs_package = 'libfilesystem-ruby1.9'
+ }
package { [
'apt-utils',
'bash-completion',
'dnsutils',
'less',
'lsb-release',
- 'libfilesystem-ruby1.8',
+ $rubyfs_package,
'mtr-tiny',
'nload',
'pciutils',
ensure => installed,
}
- if $::lsbmajdistrelease == "testing/unstable" or $::lsbmajdistrelease >= 7 {
- package { 'libfilesystem-ruby1.9.1':
- ensure => installed,
- }
- }
-
munin::check { [
'cpu',
'entropy',
content => "",
}
- site::aptrepo { 'security':
- url => 'http://security.debian.org/',
- suite => "${::lsbdistcodename}/updates",
- components => ['main','contrib','non-free']
- }
- if $::lsbmajdistrelease != "testing/unstable" and $::lsbmajdistrelease < 7 {
- site::aptrepo { 'debian-lts':
- url => $mirror,
- suite => "${::lsbdistcodename}-lts",
+ if ($::lsbmajdistrelease >= 8) {
+ site::aptrepo { 'security':
+ url => 'http://security-cdn.debian.org/',
+ suite => "${mungedcodename}/updates",
components => ['main','contrib','non-free']
}
} else {
- site::aptrepo { 'debian-lts':
+ site::aptrepo { 'security':
ensure => absent,
}
}
+ site::aptrepo { 'debian-lts':
+ ensure => absent,
+ }
site::aptrepo { 'backports.debian.org':
- url => $mirror_backports,
+ url => $mirror,
suite => "${::lsbdistcodename}-backports",
components => ['main','contrib','non-free']
}
components => ['main','contrib','non-free']
}
- #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
- # ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
- # site::aptrepo { 'proposed-updates':
- # url => $mirror,
- # suite => "${::lsbdistcodename}-proposed-updates",
- # components => ['main','contrib','non-free']
- # }
- #} else {
+ if ($::hostname in [] or $::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+ site::aptrepo { 'proposed-updates':
+ url => $mirror,
+ suite => "${mungedcodename}-proposed-updates",
+ components => ['main','contrib','non-free']
+ }
+ } else {
site::aptrepo { 'proposed-updates':
ensure => absent,
}
- #}
+ }
site::aptrepo { 'debian.org':
ensure => absent,
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']
}
}
+ site::aptrepo { 'debian-cdn':
+ ensure => absent,
+ }
+
+ site::aptrepo { 'debian2':
+ url => "http://cdn-fastly.deb.debian.org/debian",
+ suite => $mungedcodename,
+ components => ['main','contrib','non-free']
+ }
file { '/etc/facter':
ensure => directory,
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':
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':
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"
+ }
+
+ exec { 'systemd-tmpfiles --create --exclude-prefix=/dev':
+ refreshonly => true,
+ onlyif => "test -x /bin/systemd-tmpfiles"
+ }
+
tidy { '/var/lib/puppet/clientbucket/':
age => '2w',
recurse => 9,