Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343784 )
Change subject: Unbreak diffserver by fixing configs
......................................................................
Unbreak diffserver by fixing configs
* Copy-pasta bug fixed with diffserver.config.js
* Update parsoid-vd.settings.js to reflect new visualdiff domain
and updated nginx settings for visualdiffs (/diff)
Change-Id: I177c66305dbbb60148191a127d2736413bb7de92
---
M modules/testreduce/templates/parsoid-vd.settings.js.erb
M modules/visualdiff/templates/diffserver.config.js.erb
2 files changed, 28 insertions(+), 34 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/modules/testreduce/templates/parsoid-vd.settings.js.erb
b/modules/testreduce/templates/parsoid-vd.settings.js.erb
index c88260f..9534ced 100644
--- a/modules/testreduce/templates/parsoid-vd.settings.js.erb
+++ b/modules/testreduce/templates/parsoid-vd.settings.js.erb
@@ -39,14 +39,14 @@
coordPort: <%= @coord_port %>,
// (Optional) Remote server, if any, that will generate full results
- resultServer: "http://parsoid-tests.wikimedia.org/visualdiff-item/";,
+ resultServer: "http://parsoid-vd-tests.wikimedia.org/diff";,
// (Optional) Localhost server, if any, for generating the same results
localhostServer: "http://localhost:8002/";,
// (Optional)
generateTitleUrl: function(server, prefix, title) {
- return server.replace(/\/$/, '') + "/diff/" + prefix + "/" +
title;
+ return server.replace(/\/$/, '/') + prefix + "/" + title;
},
parsoidRTConfig:
require('/srv/visualdiff/testreduce/server.visualdiff.js').parsoidRTConfig,
diff --git a/modules/visualdiff/templates/diffserver.config.js.erb
b/modules/visualdiff/templates/diffserver.config.js.erb
index 971a728..f00e4fc 100644
--- a/modules/visualdiff/templates/diffserver.config.js.erb
+++ b/modules/visualdiff/templates/diffserver.config.js.erb
@@ -5,41 +5,35 @@
if (typeof module === 'object') {
module.exports = {
- server: {
- host: 'localhost',
- port: 8002,
- },
- opts: {
- viewportWidth: 1920,
- viewportHeight: 1080,
+ viewportWidth: 1920,
+ viewportHeight: 1080,
- filePrefix: null,
- outdir: '/srv/visualdiff/pngs',
- quiet: true,
+ filePrefix: null,
+ outdir: '/srv/visualdiff/pngs',
+ quiet: true,
- html1: {
- name: 'php',
- dumpHTML: false,
- postprocessorScript:
'/srv/visualdiff/lib/php_parser.postprocess.js',
- injectJQuery: false,
- },
- // HTML2 generator options
- html2: {
- name: 'parsoid',
- server: 'http://localhost:8000',
- dumpHTML: false,
- postprocessorScript:
'/srv/visualdiff/lib/parsoid.postprocess.js',
- stylesYamlFile:
'/srv/visualdiff/lib/parsoid.custom_styles.yaml',
- injectJQuery: true,
- },
+ html1: {
+ name: 'php',
+ dumpHTML: false,
+ postprocessorScript:
'/srv/visualdiff/lib/php_parser.postprocess.js',
+ injectJQuery: false,
+ },
+ // HTML2 generator options
+ html2: {
+ name: 'parsoid',
+ server: 'http://localhost:8000',
+ dumpHTML: false,
+ postprocessorScript:
'/srv/visualdiff/lib/parsoid.postprocess.js',
+ stylesYamlFile:
'/srv/visualdiff/lib/parsoid.custom_styles.yaml',
+ injectJQuery: true,
+ },
- // Engine for image diffs, may be resemble or uprightdiff
- diffEngine: 'uprightdiff',
+ // Engine for image diffs, may be resemble or uprightdiff
+ diffEngine: 'uprightdiff',
- // UprightDiff options
- uprightDiffSettings: {
- binary: '/usr/local/bin/uprightdiff'
- },
- }
+ // UprightDiff options
+ uprightDiffSettings: {
+ binary: '/usr/local/bin/uprightdiff'
+ },
};
}
--
To view, visit https://gerrit.wikimedia.org/r/343784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I177c66305dbbb60148191a127d2736413bb7de92
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
