Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/86889
Change subject: Repalce exec calls with file and user.
......................................................................
Repalce exec calls with file and user.
I think using file and user with require makes more sense here than using exec,
but I might be missing something.
Change-Id: I17ca9eea02499476b2d14b7c5260ec94e8fc4c74
---
M manifests/mail.pp
1 file changed, 13 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/86889/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 00f8d4b..0cf24b2 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -9,11 +9,12 @@
package { [ "exim4-config", "exim4-daemon-${install_type}" ]:
ensure => latest }
if $install_type == "heavy" {
- exec { "mkdir /var/spool/exim4/scan":
- require => Package[exim4-daemon-heavy],
- path => "/bin:/usr/bin",
- creates => "/var/spool/exim4/scan"
- }
+ file { [ "/var/spool/exim4/scan",
"/var/spool/exim4/db" ]:
+ ensure => directory,
+ owner => Debian-exim,
+ group => Debian-exim,
+ require => package[exim4-daemon-heavy]
+ }
mount { [ "/var/spool/exim4/scan",
"/var/spool/exim4/db" ]:
device => "none",
@@ -22,21 +23,13 @@
ensure => mounted
}
- file { [ "/var/spool/exim4/scan", "/var/spool/exim4/db"
]:
- ensure => directory,
- owner => Debian-exim,
- group => Debian-exim
- }
-
- # add nagios to the Debian-exim group to allow
check_disk tmpfs mounts (puppet still can't manage existing users?! so just
Exec)
- exec { "nagios_to_exim_group":
- command => "usermod -a -G Debian-exim nagios",
- path => "/usr/sbin";
- }
-
- Exec["mkdir /var/spool/exim4/scan"] ->
Mount["/var/spool/exim4/scan"] -> File["/var/spool/exim4/scan"]
- Package[exim4-daemon-heavy] ->
Mount["/var/spool/exim4/db"] -> File["/var/spool/exim4/db"]
- }
+ user { "nagios":
+ name => nagios,
+ ensure => present,
+ groups => Debian-exim,
+ }
+ }
+
file {
"/etc/default/exim4":
--
To view, visit https://gerrit.wikimedia.org/r/86889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17ca9eea02499476b2d14b7c5260ec94e8fc4c74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
