jenkins-bot has submitted this change and it was merged.
Change subject: Parsoid: let the service use the right config
......................................................................
Parsoid: let the service use the right config
With the recent repo outline changes, the configuration file has been
moved too. This patch moves it for vagrant and ensures Parsoid takes it
on start-up regardless of its default location.
Bug: T116091
Change-Id: I0b6e6b0a28210ca1e60dfac696fcbf400a891e2a
---
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/mediawiki/templates/parsoid.conf.erb
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp
b/puppet/modules/mediawiki/manifests/parsoid.pp
index a1534e6..626a91e 100644
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ b/puppet/modules/mediawiki/manifests/parsoid.pp
@@ -53,8 +53,8 @@
require => Package['nodejs', 'nodejs-legacy'],
}
- file { 'localsettings.js':
- path => "${dir}/src/api/localsettings.js",
+ file { 'parsoid-localsettings.js':
+ path => "${dir}/src/localsettings.js",
content => template('mediawiki/parsoid.localsettings.js.erb'),
require => Git::Clone['mediawiki/services/parsoid/deploy'],
}
@@ -73,6 +73,6 @@
ensure => running,
enable => true,
provider => 'upstart',
- subscribe => File['localsettings.js', '/etc/init/parsoid.conf'],
+ subscribe => File['parsoid-localsettings.js',
'/etc/init/parsoid.conf'],
}
}
diff --git a/puppet/modules/mediawiki/templates/parsoid.conf.erb
b/puppet/modules/mediawiki/templates/parsoid.conf.erb
index 03d2546..ec27bd1 100644
--- a/puppet/modules/mediawiki/templates/parsoid.conf.erb
+++ b/puppet/modules/mediawiki/templates/parsoid.conf.erb
@@ -15,6 +15,6 @@
env NODE_PATH="<%= @dir %>/node_modules"
chdir "<%= @dir %>"
-exec node src/bin/server.js --num-workers <%= @workers %>
+exec node src/bin/server.js --num-workers <%= @workers %> --config <%= @dir
%>/src/localsettings.js
respawn
--
To view, visit https://gerrit.wikimedia.org/r/249426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b6e6b0a28210ca1e60dfac696fcbf400a891e2a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Sbisson <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
