projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
except with correct path
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
manifests
/
init.pp
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
5258dfb
..
f6e9874
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-1,11
+1,22
@@
class debian-org {
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',
$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 { [
]
package { [
@@
-20,11
+31,9
@@
class debian-org {
'dsa-munin-plugins',
]:
ensure => installed,
'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',
package { [
'apt-utils',
'bash-completion',
@@
-39,6
+48,12
@@
class debian-org {
ensure => installed,
}
ensure => installed,
}
+ if $::lsbmajdistrelease >= 7 {
+ package { 'libfilesystem-ruby1.9.1':
+ ensure => installed,
+ }
+ }
+
munin::check { [
'cpu',
'entropy',
munin::check { [
'cpu',
'entropy',
@@
-62,10
+77,7
@@
class debian-org {
if getfromhash($site::nodeinfo, 'broken-rtc') {
package { 'fake-hwclock':
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,
}
}
}
}
@@
-83,32
+95,36
@@
class debian-org {
require => Package['molly-guard'],
}
require => Package['molly-guard'],
}
- # This really means 'not wheezy'
+ site::aptrepo { 'security':
+ url => 'http://security.debian.org/',
+ suite => "${::lsbdistcodename}/updates",
+ components => ['main','contrib','non-free']
+ }
- if $::debarchitecture != 'armhf' {
- site::aptrepo { 'security':
- url => 'http://security.debian.org/',
- 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,
+ keyid => '16BA136C',
+ key => 'puppet:///modules/debian-org/backports.org.asc',
+ }
-
site::aptrepo { 'backports.debian.org
':
-
url => 'http://backports.debian.org/debian-backports/'
,
-
suite => "${::lsbdistcodename}-backport
s",
-
components => ['main','contrib','non-free']
-
}
+
site::aptrepo { 'volatile
':
+
url => $mirror
,
+
suite => "${::lsbdistcodename}-update
s",
+ components => ['main','contrib','non-free']
+ }
- site::aptrepo { 'volatile':
- url => 'http://ftp.debian.org/debian',
- suite => "${::lsbdistcodename}-updates",
+ 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']
}
}
components => ['main','contrib','non-free']
}
}
- site::aptrepo { 'backports.org':
- ensure => absent,
- keyid => '16BA136C',
- key => 'puppet:///modules/debian-org/backports.org.asc',
- }
site::aptrepo { 'debian.org':
ensure => absent,
site::aptrepo { 'debian.org':
ensure => absent,
@@
-121,6
+137,14
@@
class debian-org {
key => 'puppet:///modules/debian-org/db.debian.org.asc',
}
key => 'puppet:///modules/debian-org/db.debian.org.asc',
}
+ if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
+ site::aptrepo { 'debian':
+ url => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
+ suite => $::lsbdistcodename,
+ components => ['main','contrib','non-free']
+ }
+ }
+
file { '/etc/facter':
ensure => directory,
purge => true,
file { '/etc/facter':
ensure => directory,
purge => true,
@@
-154,6
+178,10
@@
class debian-org {
source => 'puppet:///modules/debian-org/timezone',
notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
source => 'puppet:///modules/debian-org/timezone',
notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
}
+ if $::hostname == handel {
+ include puppetmaster::db
+ $dbpassword = $puppetmaster::db::password
+ }
file { '/etc/puppet/puppet.conf':
content => template('debian-org/puppet.conf.erb'),
}
file { '/etc/puppet/puppet.conf':
content => template('debian-org/puppet.conf.erb'),
}
@@
-161,12
+189,12
@@
class debian-org {
source => 'puppet:///modules/debian-org/puppet.default',
}
file { '/etc/cron.d/dsa-puppet-stuff':
source => 'puppet:///modules/debian-org/puppet.default',
}
file { '/etc/cron.d/dsa-puppet-stuff':
- source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
+ source
=> 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
require => Package['debian.org'],
}
file { '/etc/ldap/ldap.conf':
require => Package['debian.org'],
require => Package['debian.org'],
}
file { '/etc/ldap/ldap.conf':
require => Package['debian.org'],
- source => 'puppet:///modules/debian-org/ldap.conf',
+ source
=> 'puppet:///modules/debian-org/ldap.conf',
}
file { '/etc/pam.d/common-session':
require => Package['debian.org'],
}
file { '/etc/pam.d/common-session':
require => Package['debian.org'],
@@
-189,12
+217,19
@@
class debian-org {
source => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore',
require => Package['debian.org']
}
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':
# 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',
}
site::alternative { 'editor':
linkto => '/usr/bin/vim.basic',
@@
-203,15
+238,24
@@
class debian-org {
linkto => '/usr/bin/vim.basic',
}
mailalias { 'samhain-reports':
linkto => '/usr/bin/vim.basic',
}
mailalias { 'samhain-reports':
- ensure => present,
+ ensure
=> present,
recipient => $debianadmin,
recipient => $debianadmin,
- require => Package['debian.org']
+ require => Package['debian.org']
+ }
+
+ file { '/usr/local/bin/check_for_updates':
+ source => 'puppet:///modules/debian-org/check_for_updates',
+ mode => '0755',
+ owner => root,
+ group => root,
}
exec { 'apt-get update':
}
exec { 'apt-get update':
- path => '/usr/bin:/usr/sbin:/bin:/sbin',
- refreshonly => true,
+ path => '/usr/bin:/usr/sbin:/bin:/sbin',
+ onlyif => '/usr/local/bin/check_for_updates',
+ require => File['/opt/bin/check_for_updates']
}
}
+ Exec['apt-get update']->Package<| tag == extra_repo |>
exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
path => '/usr/bin:/usr/sbin:/bin:/sbin',
@@
-228,4
+272,12
@@
class debian-org {
exec { 'init q':
refreshonly => true
}
exec { 'init q':
refreshonly => true
}
+
+ tidy { '/var/lib/puppet/clientbucket/':
+ age => '2w',
+ recurse => 9,
+ type => ctime,
+ matches => [ 'paths', 'contents' ],
+ schedule => weekly
+ }
}
}