Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130592
Change subject: torrus: Conditionalize declaration of rewrite
......................................................................
torrus: Conditionalize declaration of rewrite
Have the rewrite module only included in torrus if it is not already
defined. Ugly workaround, the problem should be solved better but will
do for now
Change-Id: I6869e94453501c8e7bb46b2dd871d60ff622dd63
---
M manifests/misc/torrus.pp
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/130592/1
diff --git a/manifests/misc/torrus.pp b/manifests/misc/torrus.pp
index d8924df..1ccb494 100644
--- a/manifests/misc/torrus.pp
+++ b/manifests/misc/torrus.pp
@@ -14,7 +14,13 @@
ensure => latest
}
- @webserver::apache::module { ["perl", "rewrite"]: }
+ @webserver::apache::module { "perl": }
+ # This is an ugly ugly workaround to other classes also
+ # declaring a use of the rewrite module. Case in hand is
librenms on
+ # netmon1001
+ if !defined(Webserver::Apache::Module['rewrite']) {
+ @webserver::apache::module { "rewrite": }
+ }
@webserver::apache::site { "torrus.wikimedia.org":
require => Webserver::Apache::Module[["perl",
"rewrite"]],
docroot => "/var/www",
--
To view, visit https://gerrit.wikimedia.org/r/130592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6869e94453501c8e7bb46b2dd871d60ff622dd63
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
