projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sudoers is handled with 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
ec92378
..
befbcf3
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-8,7
+8,6
@@
class debian-org {
"csh": ensure => installed;
"ntp": ensure => installed;
"locales-all": ensure => installed;
"csh": ensure => installed;
"ntp": ensure => installed;
"locales-all": ensure => installed;
- "sudo": ensure => installed;
"libpam-pwdfile": ensure => installed;
"vim": ensure => installed;
"gnupg": ensure => installed;
"libpam-pwdfile": ensure => installed;
"vim": ensure => installed;
"gnupg": ensure => installed;
@@
-21,7
+20,6
@@
class debian-org {
"pciutils": ensure => installed;
"dnsutils": ensure => installed;
"bash-completion": ensure => installed;
"pciutils": ensure => installed;
"dnsutils": ensure => installed;
"bash-completion": ensure => installed;
- "dsa-nagios-nrpe-config": ensure => latest;
"libfilesystem-ruby1.8": ensure => installed;
}
file {
"libfilesystem-ruby1.8": ensure => installed;
}
file {
@@
-39,6
+37,8
@@
class debian-org {
source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
"/etc/apt/apt.conf.d/local-pdiffs":
source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
"/etc/apt/apt.conf.d/local-pdiffs":
source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
+ "/etc/timezone":
+ source => "puppet:///files/etc/timezone";
"/etc/puppet/puppet.conf":
source => "puppet:///files/etc/puppet/puppet.conf",
notify => Exec["puppet reload"];
"/etc/puppet/puppet.conf":
source => "puppet:///files/etc/puppet/puppet.conf",
notify => Exec["puppet reload"];