projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move samhain_recipients to hiera
[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
eb0c425
..
af8f8bb
100644
(file)
--- a/
modules/debian_org/manifests/init.pp
+++ b/
modules/debian_org/manifests/init.pp
@@
-19,13
+19,7
@@
class debian_org {
package { 'virt-what': ensure => purged }
}
package { 'virt-what': ensure => purged }
}
- $debianadmin = [
- 'debian-archive-debian-samhain-reports@master.debian.org',
- 'debian-admin@ftbfs.de',
- 'weasel@debian.org',
- 'steve@lobefin.net',
- 'zumbi@oron.es'
- ]
+ $samhain_recipients = hiera('samhain_recipients')
package { [
'klogd',
package { [
'klogd',
@@
-39,7
+33,9
@@
class debian_org {
}
package { [
'debian.org',
}
package { [
'debian.org',
+ 'debian.org-recommended',
'dsa-munin-plugins',
'dsa-munin-plugins',
+ 'userdir-ldap',
]:
ensure => installed,
tag => extra_repo,
]:
ensure => installed,
tag => extra_repo,
@@
-248,7
+244,7
@@
class debian_org {
}
mailalias { 'samhain-reports':
ensure => present,
}
mailalias { 'samhain-reports':
ensure => present,
- recipient => $
debianadmin
,
+ recipient => $
samhain_recipients
,
require => Package['debian.org']
}
require => Package['debian.org']
}
@@
-313,4
+309,10
@@
class debian_org {
file { '/root/.vimrc':
source => 'puppet:///modules/debian_org/root-dotfiles/vimrc',
}
file { '/root/.vimrc':
source => 'puppet:///modules/debian_org/root-dotfiles/vimrc',
}
+
+ if versioncmp($::lsbmajdistrelease, '9') >= 0 { # older puppets do facts as strings.
+ if $::processorcount > 1 {
+ package { 'irqbalance': ensure => installed }
+ }
+ }
}
}