projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow adm to run make -C /srv/db.debian.org/dns as geodnssync on draghi without pw...
[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
2ba52d1
..
de1b4a6
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;
@@
-21,18
+21,26
@@
class debian-org {
"dnsutils": ensure => installed;
"bash-completion": ensure => installed;
"libfilesystem-ruby1.8": ensure => installed;
"dnsutils": ensure => installed;
"bash-completion": ensure => installed;
"libfilesystem-ruby1.8": ensure => installed;
+ "syslog-ng": ensure => installed;
+ "sysklogd": ensure => purged;
+ "klogd": ensure => purged;
+ "rsyslog": ensure => purged;
}
file {
"/etc/apt/preferences":
source => "puppet:///files/etc/apt/preferences";
"/etc/apt/sources.list.d/backports.org.list":
}
file {
"/etc/apt/preferences":
source => "puppet:///files/etc/apt/preferences";
"/etc/apt/sources.list.d/backports.org.list":
- source => "puppet:///files/etc/apt/sources.list.d/backports.org.list";
+ source => "puppet:///files/etc/apt/sources.list.d/backports.org.list",
+ notify => Exec["apt-get update"];
"/etc/apt/sources.list.d/debian.org.list":
"/etc/apt/sources.list.d/debian.org.list":
- source => "puppet:///files/etc/apt/sources.list.d/debian.org.list";
+ source => "puppet:///files/etc/apt/sources.list.d/debian.org.list",
+ notify => Exec["apt-get update"];
"/etc/apt/sources.list.d/security.list":
"/etc/apt/sources.list.d/security.list":
- source => "puppet:///files/etc/apt/sources.list.d/security.list";
+ source => "puppet:///files/etc/apt/sources.list.d/security.list",
+ notify => Exec["apt-get update"];
"/etc/apt/sources.list.d/volatile.list":
"/etc/apt/sources.list.d/volatile.list":
- source => "puppet:///files/etc/apt/sources.list.d/volatile.list";
+ source => "puppet:///files/etc/apt/sources.list.d/volatile.list",
+ notify => Exec["apt-get update"];
"/etc/apt/apt.conf.d/local-recommends":
source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
"/etc/apt/apt.conf.d/local-pdiffs":
"/etc/apt/apt.conf.d/local-recommends":
source => "puppet:///files/etc/apt/apt.conf.d/local-recommends";
"/etc/apt/apt.conf.d/local-pdiffs":
@@
-46,9
+54,17
@@
class debian-org {
"/etc/default/puppet":
source => "puppet:///files/etc/default/puppet",
notify => Exec["puppet restart"];
"/etc/default/puppet":
source => "puppet:///files/etc/default/puppet",
notify => Exec["puppet restart"];
+
+ "/etc/syslog-ng/syslog-ng.conf":
+ source => "puppet:///files/etc/syslog-ng/syslog-ng.conf",
+ notify => Exec["syslog-ng reload"],
+ ;
+ "/etc/logrotate.d/syslog-ng":
+ source => "puppet:///files/etc/logrotate.d/syslog-ng",
+ ;
}
case $hostname {
}
case $hostname {
-
spohr
: {
+
handel
: {
file {
"/etc/puppet/lib":
ensure => directory,
file {
"/etc/puppet/lib":
ensure => directory,
@@
-72,10
+88,19
@@
class debian-org {
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
}
+ exec { "syslog-ng reload":
+ 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,
exec { "dpkg-reconfigure tzdata -pcritical -fnoninteractive":
path => "/usr/bin:/usr/sbin:/bin:/sbin",
refreshonly => true,
- }
+ }
+ exec { "apt-get update":
+ command => 'apt-get update',
+ path => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
+ refreshonly => true
+ }
}
class debian-proliant inherits debian-org {
}
class debian-proliant inherits debian-org {
@@
-86,6
+111,7
@@
class debian-proliant inherits debian-org {
}
file {
"/etc/apt/sources.list.d/debian.restricted.list":
}
file {
"/etc/apt/sources.list.d/debian.restricted.list":
- source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
+ source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list",
+ notify => Exec["apt-get update"];
}
}
}
}