Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343099 )
Change subject: Update ruthenium nginx conf to handle updated parsoid test
domains
......................................................................
Update ruthenium nginx conf to handle updated parsoid test domains
* Split single server block into separate server blocks, one each
for parsoid-rt-tests and parsoid-vd-tests.
* Retained the legacy parsoid-tests domain to default to
parsoid-rt-tests for now.
Bug: T159995
Change-Id: Iddace17e3ef8a2afc6daad28ef2e546874517b4b
---
M modules/parsoid/templates/parsoid-testing.nginx.conf.erb
1 file changed, 27 insertions(+), 20 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/parsoid/templates/parsoid-testing.nginx.conf.erb
b/modules/parsoid/templates/parsoid-testing.nginx.conf.erb
index 6cca999..45626d9 100644
--- a/modules/parsoid/templates/parsoid-testing.nginx.conf.erb
+++ b/modules/parsoid/templates/parsoid-testing.nginx.conf.erb
@@ -1,28 +1,11 @@
server {
+ server_name parsoid-tests.wikimedia.org;
+ server_name parsoid-rt-tests.wikimedia.org;
+
listen 8001; ## listen for ipv4; this line is default and implied
- #listen [::]:80 default ipv6only=on; ## listen for ipv6
root /usr/share/nginx/www;
index index.html index.htm;
-
- # Make site accessible from http://localhost/
- server_name localhost;
-
- # testreduce web UI for visualdiffing
- location /vd_testreduce {
- rewrite /vd_testreduce/(.*) /$1 break;
- proxy_pass http://localhost:8010;
- proxy_redirect off;
- proxy_set_header Host $host;
- }
-
- # visual-diffing web UI (used for a specific test case above)
- location /vd {
- rewrite /vd/(.*) /$1 break;
- proxy_pass http://localhost:8012;
- proxy_redirect off;
- proxy_set_header Host $host;
- }
# parsoid (used for a specific test case below)
location /parsoid {
@@ -39,3 +22,27 @@
proxy_set_header Host $host;
}
}
+
+server {
+ server_name parsoid-vd-tests.wikimedia.org;
+
+ listen 8001; ## listen for ipv4; this line is default and implied
+
+ root /usr/share/nginx/www;
+ index index.html index.htm;
+
+ # visual-diffing web UI (used for a specific test case above)
+ location /vd {
+ rewrite /vd/(.*) /$1 break;
+ proxy_pass http://localhost:8012;
+ proxy_redirect off;
+ proxy_set_header Host $host;
+ }
+
+ # testreduce web UI for visualdiffing
+ location / {
+ proxy_pass http://localhost:8010;
+ proxy_redirect off;
+ proxy_set_header Host $host;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/343099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iddace17e3ef8a2afc6daad28ef2e546874517b4b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
