Alexandros Kosiaris has submitted this change and it was merged.

Change subject: RESTBase: Set the correct base path for the global domain
......................................................................


RESTBase: Set the correct base path for the global domain

Due to Varnish rewrites, requests received by RESTBase have the base
path in the form https://{domain}/api/rest_v1/ . All of the domains have
had that set except the global domain, thus making the swagger UI (the
docs) send requests to the wrong location. This patch fixes the issue.

Change-Id: Ic7363bdd54f9a187e999eae0efbd69e06c043d84
---
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 5a3d9fe..20d0a11 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -326,6 +326,7 @@
     swagger: '2.0'
     info: *wp/content-info/1.0.0
     securityDefinitions: *wp/content-security/1.0.0
+    x-host-basePath: /api/rest_v1
     x-subspecs:
       - media/v1/mathoid
     paths:
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 88922a8..8624fd1 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -343,6 +343,7 @@
     swagger: '2.0'
     info: *wp/content-info/1.0.0
     securityDefinitions: *wp/content-security/1.0.0
+    x-host-basePath: /api/rest_v1
     x-subspecs:
       - media/v1/mathoid
     paths:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7363bdd54f9a187e999eae0efbd69e06c043d84
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to