class debian-org {
+ if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
+ $mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
+ } else {
+ $mirror = 'http://http.debian.net/debian/'
+ }
+ if $::lsbmajdistrelease < 7 {
+ $mirror_backports = 'http://backports.debian.org/debian-backports/'
+ } else {
+ $mirror_backports = $mirror
+ }
$debianadmin = [
'debian-archive-debian-samhain-reports@master.debian.org',
'debian-admin@ftbfs.de',
'weasel@debian.org',
'steve@lobefin.net',
- 'paravoid@debian.org'
+ 'paravoid@debian.org',
+ 'zumbi@kos.to'
]
package { [
'dsa-munin-plugins',
]:
ensure => installed,
- require => [
- File['/etc/apt/sources.list.d/db.debian.org.list'],
- Exec['apt-get update']
- ]
+ tag => extra_repo,
}
+
package { [
'apt-utils',
'bash-completion',
}
if $::lsbmajdistrelease >= 7 {
- package { 'libfilesystem-ruby1.9':
+ package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
}
if getfromhash($site::nodeinfo, 'broken-rtc') {
package { 'fake-hwclock':
ensure => installed,
- require => [
- File['/etc/apt/sources.list.d/db.debian.org.list'],
- Exec['apt-get update']
- ]
+ tag => extra_repo,
}
}
components => ['main','contrib','non-free']
}
- if $::lsbdistcodename != 'wheezy' {
- site::aptrepo { 'backports.debian.org':
- url => 'http://backports.debian.org/debian-backports/',
- suite => "${::lsbdistcodename}-backports",
- components => ['main','contrib','non-free']
- }
-
- if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
- site::aptrepo { 'volatile':
- url => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
- suite => "${::lsbdistcodename}-updates",
- components => ['main','contrib','non-free']
- }
- } else {
- site::aptrepo { 'volatile':
- url => 'http://ftp.debian.org/debian',
- suite => "${::lsbdistcodename}-updates",
- components => ['main','contrib','non-free']
- }
- }
+ site::aptrepo { 'backports.debian.org':
+ url => $mirror_backports,
+ suite => "${::lsbdistcodename}-backports",
+ components => ['main','contrib','non-free']
}
site::aptrepo { 'backports.org':
ensure => absent,
key => 'puppet:///modules/debian-org/backports.org.asc',
}
+ site::aptrepo { 'volatile':
+ url => $mirror,
+ suite => "${::lsbdistcodename}-updates",
+ components => ['main','contrib','non-free']
+ }
+
+ if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+ site::aptrepo { 'proposed-updates':
+ url => $mirror,
+ suite => "${::lsbdistcodename}-proposed-updates",
+ components => ['main','contrib','non-free']
+ }
+ }
+
site::aptrepo { 'debian.org':
ensure => absent,
}
source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore',
require => Package['debian.org']
}
+ file { '/etc/nsswitch.conf':
+ mode => '0755',
+ source => 'puppet:///modules/debian-org/nsswitch.conf',
+ }
# set mmap_min_addr to 4096 to mitigate
# Linux NULL-pointer dereference exploits
site::sysctl { 'mmap_min_addr':
- key => 'vm.mmap_min_addr',
- value => '4096',
+ ensure => absent
+ }
+ site::sysctl { 'perf_event_paranoid':
+ key => 'kernel.perf_event_paranoid',
+ value => '2',
}
site::alternative { 'editor':
linkto => '/usr/bin/vim.basic',
path => '/usr/bin:/usr/sbin:/bin:/sbin',
refreshonly => true,
}
+ Exec['apt-get update']->Package<| tag == extra_repo |>
exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
exec { 'init q':
refreshonly => true
}
+
+ tidy { '/var/lib/puppet/clientbucket/':
+ age => '2w',
+ recurse => 9,
+ type => ctime,
+ matches => [ 'paths', 'contents' ],
+ schedule => weekly
+ }
}