Gergő Tisza has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376487 )
Change subject: Add ElectronVirtualRestService config to offline role
......................................................................
Add ElectronVirtualRestService config to offline role
Bug: T174430
Change-Id: I10aa26afd7116e9f63c1d95f38e43d2da12e4bcd
Depends-On: Id15af95f448f740b976ee8fb4da781c0a3132e68
---
M puppet/modules/role/manifests/offline.pp
M puppet/modules/role/templates/offline/VagrantRoleOffline.wiki.erb
A puppet/modules/role/templates/offline/electron-vrs.php.erb
3 files changed, 26 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/87/376487/1
diff --git a/puppet/modules/role/manifests/offline.pp
b/puppet/modules/role/manifests/offline.pp
index 852cc7c..f6288ec 100644
--- a/puppet/modules/role/manifests/offline.pp
+++ b/puppet/modules/role/manifests/offline.pp
@@ -9,6 +9,11 @@
require ::ocg
require ::electron
+ mediawiki::settings { 'Electron-VRS':
+ values => template('role/offline/electron-vrs.php.erb'),
+ priority => $::LOAD_FIRST,
+ }
+
mediawiki::extension { 'Collection':
settings => template('role/offline/Collection.php.erb'),
}
@@ -18,7 +23,7 @@
},
}
- $hostname = $::electron::vhost_name
+ $electron_hostname = $::electron::vhost_name
mediawiki::import::text { 'VagrantRoleOffline':
content => template('role/offline/VagrantRoleOffline.wiki.erb'),
}
diff --git a/puppet/modules/role/templates/offline/VagrantRoleOffline.wiki.erb
b/puppet/modules/role/templates/offline/VagrantRoleOffline.wiki.erb
index ba87b25..3665fd4 100644
--- a/puppet/modules/role/templates/offline/VagrantRoleOffline.wiki.erb
+++ b/puppet/modules/role/templates/offline/VagrantRoleOffline.wiki.erb
@@ -8,5 +8,5 @@
*
[https://github.com/wikimedia/mediawiki-services-electron-render/blob/master/README.md
electron]
Services:
-* electron: http://<%= @hostname %><%= scope['::port_fragment'] %>/
([http://<%= @hostname %><%= scope['::port_fragment']
%>/pdf?accessKey=secret&url=https%3A%2F%2Fen.wikipedia.org/wiki/Barack_Obama
test])
+* electron: http://<%= @electron_hostname %><%= scope['::port_fragment'] %>/
([http://<%= @electron_hostname %><%= scope['::port_fragment']
%>/pdf?accessKey=secret&url=https%3A%2F%2Fen.wikipedia.org/wiki/Barack_Obama
test])
diff --git a/puppet/modules/role/templates/offline/electron-vrs.php.erb
b/puppet/modules/role/templates/offline/electron-vrs.php.erb
new file mode 100644
index 0000000..d2057d8
--- /dev/null
+++ b/puppet/modules/role/templates/offline/electron-vrs.php.erb
@@ -0,0 +1,19 @@
+
+if( !isset( $wgVirtualRestConfig ) ) {
+ $wgVirtualRestConfig = array(
+ 'modules' => array(),
+ 'global' => array(
+ 'timeout' => 360,
+ 'forwardCookies' => false,
+ 'HTTPProxy' => null
+ )
+ );
+}
+
+$wgVirtualRestConfig['modules']['electron'] = array(
+ 'url' => 'http://127.0.0.1:<%= scope.lookupvar('::electron::port') %>',
+ 'options' => array(
+ 'accessKey' => '<%= scope.lookupvar('::electron::secret') %>',
+ ),
+);
+
--
To view, visit https://gerrit.wikimedia.org/r/376487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10aa26afd7116e9f63c1d95f38e43d2da12e4bcd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
