projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rossini going to squeeze
[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
3a3c8b2
..
b19a745
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-39,7
+39,6
@@
class debian-org {
"nload": ensure => installed;
"pciutils": ensure => installed;
"pdksh": ensure => installed;
"nload": ensure => installed;
"pciutils": ensure => installed;
"pdksh": ensure => installed;
- "puppet": ensure => installed;
"rsyslog": ensure => purged;
"sysklogd": ensure => purged;
"syslog-ng": ensure => installed;
"rsyslog": ensure => purged;
"sysklogd": ensure => purged;
"syslog-ng": ensure => installed;
@@
-51,7
+50,7
@@
class debian-org {
}
file {
"/etc/apt/preferences":
}
file {
"/etc/apt/preferences":
- source => "puppet:///
files/etc/apt/
preferences";
+ source => "puppet:///
modules/debian-org/apt.
preferences";
"/etc/apt/sources.list.d/backports.org.list":
content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
notify => Exec["apt-get update"];
"/etc/apt/sources.list.d/backports.org.list":
content => template("debian-org/etc/apt/sources.list.d/backports.org.list.erb"),
notify => Exec["apt-get update"];
@@
-65,32
+64,32
@@
class debian-org {
content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
notify => Exec["apt-get update"];
"/etc/apt/apt.conf.d/local-recommends":
content => template("debian-org/etc/apt/sources.list.d/volatile.list.erb"),
notify => Exec["apt-get update"];
"/etc/apt/apt.conf.d/local-recommends":
- source => "puppet:///
files/etc/apt
/apt.conf.d/local-recommends";
+ source => "puppet:///
modules/debian-org
/apt.conf.d/local-recommends";
"/etc/apt/apt.conf.d/local-pdiffs":
"/etc/apt/apt.conf.d/local-pdiffs":
- source => "puppet:///
files/etc/apt
/apt.conf.d/local-pdiffs";
+ source => "puppet:///
modules/debian-org
/apt.conf.d/local-pdiffs";
"/etc/timezone":
"/etc/timezone":
- source => "puppet:///
files/etc
/timezone",
+ source => "puppet:///
modules/debian-org
/timezone",
notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
"/etc/puppet/puppet.conf":
notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
"/etc/puppet/puppet.conf":
- require => Package["puppet"],
- source => "puppet:///
files/etc/puppet
/puppet.conf"
+
#
require => Package["puppet"],
+ source => "puppet:///
modules/debian-org
/puppet.conf"
;
"/etc/default/puppet":
;
"/etc/default/puppet":
- require => Package["puppet"],
- source => "puppet:///
files/etc/default/puppe
t"
+
#
require => Package["puppet"],
+ source => "puppet:///
modules/debian-org/puppet.defaul
t"
;
;
-
+
"/etc/cron.d/dsa-puppet-stuff":
"/etc/cron.d/dsa-puppet-stuff":
- source => "puppet:///
files/etc/cron.d/dsa-puppet-stuff
",
+ source => "puppet:///
modules/debian-org/dsa-puppet-stuff.cron
",
require => Package["cron"]
;
"/etc/ldap/ldap.conf":
require => Package["userdir-ldap"],
require => Package["cron"]
;
"/etc/ldap/ldap.conf":
require => Package["userdir-ldap"],
- source => "puppet:///
files/etc/ldap
/ldap.conf",
+ source => "puppet:///
modules/debian-org
/ldap.conf",
;
"/etc/pam.d/common-session":
require => Package["libpam-pwdfile"],
;
"/etc/pam.d/common-session":
require => Package["libpam-pwdfile"],
- source => "puppet:///
files/etc/pam.d/
common-session",
+ source => "puppet:///
modules/debian-org/pam.
common-session",
;
"/etc/rc.local":
mode => 0755,
;
"/etc/rc.local":
mode => 0755,
@@
-98,17
+97,6
@@
class debian-org {
notify => Exec["rc.local start"],
;
}
notify => Exec["rc.local start"],
;
}
- case $hostname {
- handel: {
- file {
- "/etc/puppet/lib":
- ensure => directory,
- source => "puppet:///files/etc/puppet/lib",
- recurse => true,
- notify => Exec["puppetmaster restart"];
- }
- }
- }
# set mmap_min_addr to 4096 to mitigate
# Linux NULL-pointer dereference exploits
# set mmap_min_addr to 4096 to mitigate
# Linux NULL-pointer dereference exploits
@@
-149,9
+137,16
@@
class debian-proliant inherits debian-org {
package {
"hpacucli": ensure => installed;
"hp-health": ensure => installed;
package {
"hpacucli": ensure => installed;
"hp-health": ensure => installed;
- "cpqarrayd": ensure => installed;
"arrayprobe": ensure => installed;
}
"arrayprobe": ensure => installed;
}
+ case extractnodeinfo($nodeinfo, 'squeeze') {
+ true: {}
+ default: {
+ package {
+ "cpqarrayd": ensure => installed;
+ }
+ }
+ }
case $debarchitecture {
"amd64": {
package { "lib32gcc1": ensure => installed; }
case $debarchitecture {
"amd64": {
package { "lib32gcc1": ensure => installed; }
@@
-163,6
+158,19
@@
class debian-proliant inherits debian-org {
notify => Exec["apt-get update"];
}
}
notify => Exec["apt-get update"];
}
}
+
+class debian-radvd inherits debian-org {
+ sysctl {
+ "dsa-accept-ra-default" :
+ key => "net.ipv6.conf.default.accept_ra",
+ value => 0,
+ }
+ sysctl {
+ "dsa-accept-ra-all" :
+ key => "net.ipv6.conf.all.accept_ra",
+ value => 0,
+ }
+}
# vim:set et:
# vim:set sts=4 ts=4:
# vim:set shiftwidth=4:
# vim:set et:
# vim:set sts=4 ts=4:
# vim:set shiftwidth=4: