projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enable mod headers everywhere
[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
9feb912
..
2afdd4f
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-15,7
+15,8
@@
class debian-org {
'debian-admin@ftbfs.de',
'weasel@debian.org',
'steve@lobefin.net',
'debian-admin@ftbfs.de',
'weasel@debian.org',
'steve@lobefin.net',
- 'paravoid@debian.org'
+ 'paravoid@debian.org',
+ 'zumbi@kos.to'
]
package { [
]
package { [
@@
-101,7
+102,7
@@
class debian-org {
}
site::aptrepo { 'backports.debian.org':
}
site::aptrepo { 'backports.debian.org':
- url => $mirror_backports
+ url => $mirror_backports
,
suite => "${::lsbdistcodename}-backports",
components => ['main','contrib','non-free']
}
suite => "${::lsbdistcodename}-backports",
components => ['main','contrib','non-free']
}
@@
-117,6
+118,14
@@
class debian-org {
components => ['main','contrib','non-free']
}
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,
}
site::aptrepo { 'debian.org':
ensure => absent,
}
@@
-208,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',