projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set keep_hostname to no
[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
75bb70d
..
8ab16b5
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-42,31
+42,17
@@
class debian-org {
package {
"apt-utils": ensure => installed;
"bash-completion": ensure => installed;
package {
"apt-utils": ensure => installed;
"bash-completion": ensure => installed;
- "bzip2": ensure => installed;
- "cron": ensure => installed;
- "csh": ensure => installed;
+ "debian.org": ensure => installed;
"dnsutils": ensure => installed;
"dsa-munin-plugins": ensure => installed;
"dnsutils": ensure => installed;
"dsa-munin-plugins": ensure => installed;
- "ed": ensure => installed;
- "gnupg": ensure => installed;
"klogd": ensure => purged;
"klogd": ensure => purged;
- "ksh": ensure => installed;
"less": ensure => installed;
"libfilesystem-ruby1.8": ensure => installed;
"less": ensure => installed;
"libfilesystem-ruby1.8": ensure => installed;
- "libpam-pwdfile": ensure => installed;
- "locales-all": ensure => installed;
"mtr-tiny": ensure => installed;
"nload": ensure => installed;
"pciutils": ensure => installed;
"mtr-tiny": ensure => installed;
"nload": ensure => installed;
"pciutils": ensure => installed;
- "pdksh": ensure => installed;
"rsyslog": ensure => purged;
"sysklogd": ensure => purged;
"rsyslog": ensure => purged;
"sysklogd": ensure => purged;
- "syslog-ng": ensure => installed;
- "tcsh": ensure => installed;
- "userdir-ldap": ensure => installed;
- "vim": ensure => installed;
- "zsh": ensure => installed;
- "logrotate": ensure => installed;
}
file {
"/etc/apt/preferences":
}
file {
"/etc/apt/preferences":
@@
-101,14
+87,14
@@
class debian-org {
"/etc/cron.d/dsa-puppet-stuff":
source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
"/etc/cron.d/dsa-puppet-stuff":
source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron",
- require => Package["
cron
"]
+ require => Package["
debian.org
"]
;
"/etc/ldap/ldap.conf":
;
"/etc/ldap/ldap.conf":
- require => Package["
userdir-ldap
"],
+ require => Package["
debian.org
"],
source => "puppet:///modules/debian-org/ldap.conf",
;
"/etc/pam.d/common-session":
source => "puppet:///modules/debian-org/ldap.conf",
;
"/etc/pam.d/common-session":
- require => Package["
libpam-pwdfile
"],
+ require => Package["
debian.org
"],
content => template("debian-org/pam.common-session.erb"),
;
"/etc/rc.local":
content => template("debian-org/pam.common-session.erb"),
;
"/etc/rc.local":
@@
-116,6
+102,15
@@
class debian-org {
source => "puppet:///modules/debian-org/rc.local",
notify => Exec["rc.local start"],
;
source => "puppet:///modules/debian-org/rc.local",
notify => Exec["rc.local start"],
;
+
+ "/etc/dsa":
+ mode => 0755,
+ ensure => directory,
+ ;
+ "/etc/dsa/cron.ignore.dsa-puppet-stuff":
+ source => "puppet:///modules/debian-org/dsa-puppet-stuff.cron.ignore",
+ require => Package["debian.org"]
+ ;
}
# set mmap_min_addr to 4096 to mitigate
}
# set mmap_min_addr to 4096 to mitigate