Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/91573
Change subject: mail.pp: change exec to file
......................................................................
mail.pp: change exec to file
Change-Id: Ib27d1952c9c442eeb43f1f85d12e0f628f78b1e0
---
M manifests/mail.pp
1 file changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/91573/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 00f8d4b..04a6540 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",
@@ -33,9 +34,6 @@
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"]
}
file {
--
To view, visit https://gerrit.wikimedia.org/r/91573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib27d1952c9c442eeb43f1f85d12e0f628f78b1e0
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
