projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
puppet auto-upgrading packages is annoying in combination with samhain.
[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
befbcf3
..
9612a6f
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-1,5
+1,5
@@
class debian-org {
class debian-org {
- package { "userdir-ldap": ensure =>
latest
;
+ package { "userdir-ldap": ensure =>
installed
;
"zsh": ensure => installed;
"apt-utils": ensure => installed;
"tcsh": ensure => installed;
"zsh": ensure => installed;
"apt-utils": ensure => installed;
"tcsh": ensure => installed;
@@
-38,7
+38,8
@@
class debian-org {
"/etc/apt/apt.conf.d/local-pdiffs":
source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
"/etc/timezone":
"/etc/apt/apt.conf.d/local-pdiffs":
source => "puppet:///files/etc/apt/apt.conf.d/local-pdiffs";
"/etc/timezone":
- source => "puppet:///files/etc/timezone";
+ source => "puppet:///files/etc/timezone",
+ notify => Exec["dpkg-reconfigure tzdata -pcritical -fnoninteractive"];
"/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"];
@@
-46,14
+47,35
@@
class debian-org {
source => "puppet:///files/etc/default/puppet",
notify => Exec["puppet restart"];
}
source => "puppet:///files/etc/default/puppet",
notify => Exec["puppet restart"];
}
+ case $hostname {
+ handel: {
+ file {
+ "/etc/puppet/lib":
+ ensure => directory,
+ source => "puppet:///files/etc/puppet/lib",
+ recurse => true,
+ notify => Exec["puppetmaster restart"];
+ }
+ }
+ default: {}
+ }
+
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 { "puppetmaster restart":
+ 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,
}
exec { "puppet restart":
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
+ exec { "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
+ path => "/usr/bin:/usr/sbin:/bin:/sbin",
+ refreshonly => true,
+ }
}
class debian-proliant inherits debian-org {
}
class debian-proliant inherits debian-org {