jenkins-bot has submitted this change and it was merged. Change subject: mwconf: no more set $wgHTTPProxy ......................................................................
mwconf: no more set $wgHTTPProxy We had a slave with no direct access to the internet (lanthanum) hence MediaWiki was configured to funnel all requests via a webproxy in production (https://wikitech.wikimedia.org/wiki/Http_proxy ). Since Dec 24th, the service is no more reacheable by labs instances. All the CI slaves are on labs and have direct access to the internet, hence using a web proxy is no more needed. Remove the mediawiki configuration snippet that sets $wgHTTPProxy. Bug: T122449 Change-Id: I2f36bab363f01519e3900ee4761f041311f68ae5 --- D mediawiki/conf.d/10_set_wgHTTPProxy.php 1 file changed, 0 insertions(+), 26 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki/conf.d/10_set_wgHTTPProxy.php b/mediawiki/conf.d/10_set_wgHTTPProxy.php deleted file mode 100644 index e03ef26..0000000 --- a/mediawiki/conf.d/10_set_wgHTTPProxy.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php -# -# Snippet coming from integration/jenkins.git:/mediawiki/conf.d/ -# - -/** - * Set $wgHTTPProxy depending on the site the code is being executed. - * - * References: - * - https://bugzilla.wikimedia.org/59253 - * - https://wikitech.wikimedia.org/wiki/Http_proxy - */ -$wgHTTPProxy = call_user_func( function () { - $site_file = '/etc/wikimedia-site'; - $site = file_exists( $site_file ) - ? rtrim( file_get_contents( $site_file ) ) - : 'eqiad'; - - switch ( $site ) { - case 'eqiad': - default: - $proxy = 'webproxy.eqiad.wmnet:8080'; - } - - return $proxy; -} ); -- To view, visit https://gerrit.wikimedia.org/r/261096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f36bab363f01519e3900ee4761f041311f68ae5 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
