jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/366046 )

Change subject: Fix http://php5.local.wmftest.net:8080 to actually be PHP 5 
(Zend)
......................................................................


Fix http://php5.local.wmftest.net:8080 to actually be PHP 5 (Zend)

This was broken, apparently since
755639030d26936449d4bb4f4333f068d951f809

In the generated config, ServerAlias was blank.

Change-Id: Id3e87ca799961ae26f75880aab69c89b97ffd8e9
---
M puppet/modules/mediawiki/manifests/apache.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/mediawiki/manifests/apache.pp 
b/puppet/modules/mediawiki/manifests/apache.pp
index 4e4dd1c..6db5a5c 100644
--- a/puppet/modules/mediawiki/manifests/apache.pp
+++ b/puppet/modules/mediawiki/manifests/apache.pp
@@ -12,6 +12,7 @@
 #
 class mediawiki::apache(
     $docroot,
+    $php5_site_name,
 ) {
     include ::mediawiki
     include ::mediawiki::multiwiki

-- 
To view, visit https://gerrit.wikimedia.org/r/366046
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3e87ca799961ae26f75880aab69c89b97ffd8e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to