Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/138578
Change subject: mail: fix dependency cycle
......................................................................
mail: fix dependency cycle
There is a dependency cycle right now with
(Class[Exim4] => Class[Exim::Roled::Mailman] =>
Exim4::Dkim[lists.wikimedia.org] =>
File[/etc/exim4/dkim/lists.wikimedia.org-wikimedia.key] =>
Service[exim4] => Class[Exim4])
This is a byproduct of managing aliases & domainlists manually,
something that will be fixed in a subsequent iteration.
Fix this by removing class dependencies and replacing them with more
granular require => Class['exim4'] dependencies.
Change-Id: I7687c9fa8571b7089037a4b36cba34164c0718b9
---
M manifests/mail.pp
1 file changed, 15 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/138578/1
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 7e93950..eaee931 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -77,20 +77,20 @@
}
file { '/etc/exim4/defer_domains':
- ensure => present,
- owner => 'root',
- group => 'Debian-exim',
- mode => '0444',
+ ensure => present,
+ owner => 'root',
+ group => 'Debian-exim',
+ mode => '0444',
+ require => Class['exim4'],
}
class mail_relay {
- Class['exim4'] -> Class['exim::roled::mail_relay']
-
file { '/etc/exim4/relay_domains':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source =>
'puppet:///files/exim/exim4.secondary_relay_domains.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source =>
'puppet:///files/exim/exim4.secondary_relay_domains.conf',
+ require => Class['exim4'],
}
exim4::dkim { 'wikimedia.org':
@@ -101,13 +101,12 @@
}
class mailman {
- Class['exim4'] -> Class['exim::roled::mailman']
-
file { '/etc/exim4/aliases/lists.wikimedia.org':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/exim/exim4.listserver_aliases.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source =>
'puppet:///files/exim/exim4.listserver_aliases.conf',
+ require => Class['exim4'],
}
exim4::dkim { 'lists.wikimedia.org':
--
To view, visit https://gerrit.wikimedia.org/r/138578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7687c9fa8571b7089037a4b36cba34164c0718b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
