Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73324
Change subject: webserver::apache2 and webserver::php5 are conflicting, can't
use both on one node, and we already got the webserver from planet role. This
should be separate from web apps.
......................................................................
webserver::apache2 and webserver::php5 are conflicting, can't use both on one
node,
and we already got the webserver from planet role. This should be separate from
web apps.
Change-Id: I2ba0875d1f5f91ab809cbc649cfe01d35cbf6539
---
M manifests/misc/etherpad.pp
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/24/73324/1
diff --git a/manifests/misc/etherpad.pp b/manifests/misc/etherpad.pp
index 5cb6069..cc6c4f8 100644
--- a/manifests/misc/etherpad.pp
+++ b/manifests/misc/etherpad.pp
@@ -51,8 +51,7 @@
class misc::etherpad_lite {
- include webserver::apache2,
- passwords::etherpad_lite
+ include passwords::etherpad_lite
$etherpad_db_pass = $passwords::etherpad_lite::etherpad_db_pass
--
To view, visit https://gerrit.wikimedia.org/r/73324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ba0875d1f5f91ab809cbc649cfe01d35cbf6539
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
