jenkins-bot has submitted this change and it was merged.
Change subject: Parsoid: Set up the VRS entry
......................................................................
Parsoid: Set up the VRS entry
This patch sets up the VRS configuration for Parsoid whenever its role
is activated (either directly or indirectly).
Also: let role::restbase require directly role::parsoid, instead of the
restbase class requiring the mediawiki::parsoid class.
Bug: T115550
Change-Id: I164e625e5ec5ac5e1ba9c9948af3e0b0b2a33b6d
---
M puppet/modules/restbase/manifests/init.pp
M puppet/modules/role/manifests/parsoid.pp
M puppet/modules/role/manifests/restbase.pp
A puppet/modules/role/templates/parsoid/vrs.php.erb
4 files changed, 27 insertions(+), 1 deletion(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/restbase/manifests/init.pp
b/puppet/modules/restbase/manifests/init.pp
index 75e6e6c..eab2bcf 100644
--- a/puppet/modules/restbase/manifests/init.pp
+++ b/puppet/modules/restbase/manifests/init.pp
@@ -23,7 +23,6 @@
$dbdir,
$log_level = undef,
) {
- require ::mediawiki::parsoid
require_package('libsqlite3-dev')
diff --git a/puppet/modules/role/manifests/parsoid.pp
b/puppet/modules/role/manifests/parsoid.pp
index 5b85115..0c7a899 100644
--- a/puppet/modules/role/manifests/parsoid.pp
+++ b/puppet/modules/role/manifests/parsoid.pp
@@ -2,4 +2,11 @@
# Configures Parsoid, a wikitext parsing service
class role::parsoid {
include ::mediawiki::parsoid
+
+ # register the PHP Virtual REST Service connector
+ mediawiki::settings { 'parsoid-vrs':
+ values => template('role/parsoid/vrs.php.erb'),
+ priority => 4,
+ }
+
}
diff --git a/puppet/modules/role/manifests/restbase.pp
b/puppet/modules/role/manifests/restbase.pp
index 327c7ae..e3457ed 100644
--- a/puppet/modules/role/manifests/restbase.pp
+++ b/puppet/modules/role/manifests/restbase.pp
@@ -1,6 +1,7 @@
# == Class: role::restbase
# Provisions RESTBase, a REST content API service
class role::restbase {
+ require ::role::parsoid
require ::restbase
# set up the update extension
diff --git a/puppet/modules/role/templates/parsoid/vrs.php.erb
b/puppet/modules/role/templates/parsoid/vrs.php.erb
new file mode 100644
index 0000000..885fd6e
--- /dev/null
+++ b/puppet/modules/role/templates/parsoid/vrs.php.erb
@@ -0,0 +1,19 @@
+
+if( !isset( $wgVirtualRestConfig ) ) {
+ $wgVirtualRestConfig = array(
+ 'modules' => array(),
+ 'global' => array(
+ 'timeout' => 360,
+ 'forwardCookies' => false,
+ 'HTTPProxy' => null
+ )
+ );
+}
+
+$wgVirtualRestConfig['modules']['parsoid'] = array(
+ 'url' => 'http://localhost:<%=
scope.lookupvar('::mediawiki::parsoid::port') %>',
+ 'domain' => '<%= scope.lookupvar('::mediawiki::parsoid::domain') %>',
+ 'forwardCookies' => true,
+ 'restbaseCompat' => false
+);
+
--
To view, visit https://gerrit.wikimedia.org/r/246888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I164e625e5ec5ac5e1ba9c9948af3e0b0b2a33b6d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
