jenkins-bot has submitted this change and it was merged.
Change subject: Re-enable PediaPress POD in production.
......................................................................
Re-enable PediaPress POD in production.
Bug: 71675
Change-Id: Ifd9ac9e26c83c67861cc3dcc115726bc45b4710c
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
2 files changed, 9 insertions(+), 13 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
Nemo bis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 79ff655..615c63a 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -168,15 +168,6 @@
$wgCollectionMWServeURL = 'http://deployment-pdf01:8000';
$wgCollectionFormats[ 'rdf2text' ] = 'TXT';
$wgCollectionPortletFormats[] = 'rdf2text';
- // enable pediapress in labs for testing (see bug 71675)
- $wgCollectionPODPartners = array(
- 'pediapress' => array(
- 'name' => 'PediaPress',
- 'url' => 'http://pediapress.com/',
- 'posturl' => 'http://pediapress.com/api/collections/',
- 'infopagetitle' => 'coll-order_info_article',
- ),
- );
}
if ( $wmgUsePageImages ) {
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2e5fa7c..30cb134 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1592,13 +1592,18 @@
// PediaPress / PDF generation
include "$IP/extensions/Collection/Collection.php";
$wgCollectionMWServeURL = 'http://ocg.svc.eqiad.wmnet:8000';
- // Use pediapress server for POD function
+ // Use pediapress server for POD function (bug 71675)
$wgCollectionCommandToServeURL = array(
'zip_post' => 'https://pediapress.com/wmfup/',
);
- // ...but disable pediapress for now (bug 71675)
- // (until https://gerrit.wikimedia.org/r/165234 is deployed)
- $wgCollectionPODPartners = false;
+ $wgCollectionPODPartners = array(
+ 'pediapress' => array(
+ 'name' => 'PediaPress',
+ 'url' => 'http://pediapress.com/',
+ 'posturl' => 'http://pediapress.com/api/collections/',
+ 'infopagetitle' => 'coll-order_info_article',
+ ),
+ );
// MediaWiki namespace is not a good default
$wgCommunityCollectionNamespace = NS_PROJECT;
--
To view, visit https://gerrit.wikimedia.org/r/167866
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd9ac9e26c83c67861cc3dcc115726bc45b4710c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
