projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do we need this?
[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
e1871fa
..
2601ddc
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-39,6
+39,7
@@
define linux_module ($ensure) {
class debian-org {
class debian-org {
+ $debianadmin = [ "debian-archive-debian-samhain-reports@master.debian.org", "debian-admin@ftbfs.de", "weasel@debian.org", "steve@lobefin.net", "paravoid@debian.org" ]
package {
"apt-utils": ensure => installed;
"bash-completion": ensure => installed;
package {
"apt-utils": ensure => installed;
"bash-completion": ensure => installed;
@@
-87,14
+88,14
@@
class debian-org {
"/etc/cron.d/dsa-puppet-stuff":
source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
"/etc/cron.d/dsa-puppet-stuff":
source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
- require => Package["
cron
"]
+ require => Package["
debian.org
"]
;
"/etc/ldap/ldap.conf":
;
"/etc/ldap/ldap.conf":
- require => Package["
userdir-ldap
"],
+ require => Package["
debian.org
"],
source => "puppet:///modules/debian-org/ldap.conf",
;
"/etc/pam.d/common-session":
source => "puppet:///modules/debian-org/ldap.conf",
;
"/etc/pam.d/common-session":
- require => Package["
libpam-pwdfile
"],
+ require => Package["
debian.org
"],
content => template("debian-org/pam.common-session.erb"),
;
"/etc/rc.local":
content => template("debian-org/pam.common-session.erb"),
;
"/etc/rc.local":
@@
-102,6
+103,15
@@
class debian-org {
source => "puppet:///modules/debian-org/rc.local",
notify => Exec["rc.local start"],
;
source => "puppet:///modules/debian-org/rc.local",
notify => Exec["rc.local start"],
;
+
+ "/etc/dsa":
+ mode => 0755,
+ ensure => directory,
+ ;
+ "/etc/dsa/cron.ignore.dsa-puppet-stuff":
+ source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore",
+ require => Package["debian.org"]
+ ;
}
# set mmap_min_addr to 4096 to mitigate
}
# set mmap_min_addr to 4096 to mitigate
@@
-117,6
+127,12
@@
class debian-org {
linkto => "/usr/bin/vim.basic",
}
linkto => "/usr/bin/vim.basic",
}
+ mailalias {
+ "samhain-reports":
+ recipient => $debianadmin,
+ ensure => present;
+ }
+
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",