jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/377928 )
Change subject: Add VirtualRestService config for Electron ...................................................................... Add VirtualRestService config for Electron The URLs are copied from puppet: profile::restbase::pdfrender_uri in * hieradata/labs/deployment-prep/common.yaml (labs) * hieradata/role/common/restbase/production.yaml (production) $wmgElectronSecret must be set in the private repo before deploying this. (Value is in $::service::configuration::pdfrender_key.) For the code using this, see https://gerrit.wikimedia.org/r/#/c/361453/26/includes/ElectronVirtualRestService.php Bug: T175868 Change-Id: I9709b0548413d95b972fdfe95008f62aeaee5f60 --- M wmf-config/CommonSettings.php M wmf-config/LabsServices.php M wmf-config/ProductionServices.php 3 files changed, 16 insertions(+), 4 deletions(-) Approvals: GWicke: Looks good to me, but someone else must approve Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index ce718ca..f497107 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -2226,7 +2226,7 @@ wfLoadExtension( 'Linter' ); } -if ( !isset( $wgVirtualRestConfig ) && ( $wmgUseRestbaseVRS || $wmgUseParsoid ) ) { +if ( !isset( $wgVirtualRestConfig ) && ( $wmgUseRestbaseVRS || $wmgUseParsoid || $wmgUseCollection ) ) { $wgVirtualRestConfig = [ 'modules' => [], 'global' => [ @@ -2261,6 +2261,15 @@ ]; } +if ( $wmgUseCollection ) { + $wgVirtualRestConfig['modules']['electron'] = [ + 'url' => $wmfLocalServices['electron'], + 'options' => [ + 'accessKey' => $wmgElectronSecret, // set in private repo + ], + ]; +} + if ( $wmgUseVisualEditor ) { wfLoadExtension( 'VisualEditor' ); diff --git a/wmf-config/LabsServices.php b/wmf-config/LabsServices.php index 816392b..70b5455 100644 --- a/wmf-config/LabsServices.php +++ b/wmf-config/LabsServices.php @@ -35,7 +35,8 @@ ], 'etcd' => 'deployment-etcd-01.deployment-prep.eqiad.wmflabs:2379', 'mediaSwiftAuth' => 'http://deployment-ms-fe02.deployment-prep.eqiad.wmflabs/auth', - 'mediaSwiftStore' => 'http://deployment-ms-fe02.deployment-prep.eqiad.wmflabs/v1/AUTH_mw' + 'mediaSwiftStore' => 'http://deployment-ms-fe02.deployment-prep.eqiad.wmflabs/v1/AUTH_mw', + 'electron' => 'http://deployment-pdfrender02.deployment-prep.eqiad.wmflabs:5252', ]; ### Logstash diff --git a/wmf-config/ProductionServices.php b/wmf-config/ProductionServices.php index 06ef67b..cef9c6d 100644 --- a/wmf-config/ProductionServices.php +++ b/wmf-config/ProductionServices.php @@ -25,7 +25,8 @@ 'cxserver' => 'http://cxserver.discovery.wmnet:8080', 'etcd' => '_etcd._tcp.eqiad.wmnet', 'mediaSwiftAuth' => 'https://ms-fe.svc.eqiad.wmnet/auth', - 'mediaSwiftStore' => 'https://ms-fe.svc.eqiad.wmnet/v1/AUTH_mw' + 'mediaSwiftStore' => 'https://ms-fe.svc.eqiad.wmnet/v1/AUTH_mw', + 'electron' => 'http://pdfrender.discovery.wmnet:5252', ]; $wmfAllServices['codfw'] = [ @@ -42,7 +43,8 @@ 'cxserver' => 'http://cxserver.discovery.wmnet:8080', 'etcd' => '_etcd._tcp.codfw.wmnet', 'mediaSwiftAuth' => 'https://ms-fe.svc.codfw.wmnet/auth', - 'mediaSwiftStore' => 'https://ms-fe.svc.codfw.wmnet/v1/AUTH_mw' + 'mediaSwiftStore' => 'https://ms-fe.svc.codfw.wmnet/v1/AUTH_mw', + 'electron' => 'http://pdfrender.discovery.wmnet:5252', ]; ### Logstash -- To view, visit https://gerrit.wikimedia.org/r/377928 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9709b0548413d95b972fdfe95008f62aeaee5f60 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: Bmansurov <bmansu...@wikimedia.org> Gerrit-Reviewer: Catrope <r...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org> Gerrit-Reviewer: Urbanecm <martin.urba...@wikimedia.cz> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
