projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[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
e1369d5
..
b8a8f8d
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-17,67
+17,86
@@
class debian-org {
"puppet": ensure => latest;
"mtr-tiny": ensure => latest;
"nload": ensure => latest;
"puppet": ensure => latest;
"mtr-tiny": ensure => latest;
"nload": ensure => latest;
+ "pciutils": ensure => latest;
+ "bash-completion": ensure => latest;
+ "dsa-nagios-nrpe-config": ensure => latest;
}
file {
}
file {
+ "/etc/apt/preferences":
+ owner => root,
+ group => root,
+ mode => 444,
+ ensure => file,
+ source => "puppet:///files/etc/apt/preferences";
"/etc/apt/sources.list.d/backports.org.list":
owner => root,
group => root,
"/etc/apt/sources.list.d/backports.org.list":
owner => root,
group => root,
- mode =>
6
44,
+ mode =>
4
44,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/backports.org.list";
"/etc/apt/sources.list.d/debian.org.list":
owner => root,
group => root,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/backports.org.list";
"/etc/apt/sources.list.d/debian.org.list":
owner => root,
group => root,
- mode =>
6
44,
+ mode =>
4
44,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/debian.org.list";
"/etc/apt/sources.list.d/security.list":
owner => root,
group => root,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/debian.org.list";
"/etc/apt/sources.list.d/security.list":
owner => root,
group => root,
- mode =>
6
44,
+ mode =>
4
44,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/security.list";
"/etc/apt/sources.list.d/volatile.list":
owner => root,
group => root,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/security.list";
"/etc/apt/sources.list.d/volatile.list":
owner => root,
group => root,
- mode =>
6
44,
+ mode =>
4
44,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
"/etc/apt/apt.conf.d/local-recommends":
owner => root,
group => root,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
"/etc/apt/apt.conf.d/local-recommends":
owner => root,
group => root,
- mode =>
6
44,
+ mode =>
4
44,
ensure => file,
source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
"/etc/puppet/puppet.conf":
owner => root,
group => root,
ensure => file,
source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
"/etc/puppet/puppet.conf":
owner => root,
group => root,
- mode =>
6
44,
+ mode =>
4
44,
ensure => file,
source => "puppet:///files/etc/puppet/puppet.conf",
notify => Exec["puppet reload"];
ensure => file,
source => "puppet:///files/etc/puppet/puppet.conf",
notify => Exec["puppet reload"];
- "/var/lib/puppet/facts":
- ensure => directory,
+ "/etc/default/puppet":
owner => root,
group => root,
owner => root,
group => root,
- mode => 755,
- purge => true;
+ mode => 444,
+ ensure => file,
+ source => "puppet:///files/etc/default/puppet",
+ notify => Exec["puppet restart"];
}
exec { "puppet reload":
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
}
exec { "puppet reload":
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
+ exec { "puppet restart":
+ path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+ refreshonly => true,
+ }
}
class debian-proliant inherits debian-org {
}
class debian-proliant inherits debian-org {
+ package {
+ "hpacucli": ensure => latest;
+ "cpqarrayd": ensure => latest;
+ "arrayprobe": ensure => latest;
+ }
file {
"/etc/apt/sources.list.d/debian.restricted.list":
owner => root,
group => root,
file {
"/etc/apt/sources.list.d/debian.restricted.list":
owner => root,
group => root,
- mode =>
6
44,
+ mode =>
4
44,
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
}
ensure => file,
source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
}