Mobrovac has uploaded a new change for review.
https://gerrit.wikimedia.org/r/307320
Change subject: Citoid: Fix the service URL properly
......................................................................
Citoid: Fix the service URL properly
I8183d8d8b4875bf3b50e7485f9b63781ff14db31 tried to fix the extension's
URL, but failed to do so. Instead of using MW variables, use the config
from hiera which is known to work.
Bug: T144027
Change-Id: Iec2104cc12df1ed37828b131c6d65a30184a1058
---
M puppet/hieradata/common.yaml
M puppet/modules/role/manifests/citoid.pp
2 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/20/307320/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 7c3d9fe..fbc6a85 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -26,8 +26,9 @@
cdh::oozie::server::db_root_password: "%{hiera('mysql::root_password')}"
cdh::oozie::server::heapsize: 64
-citoid::port: 1970
+citoid::port: '1970'
citoid::log_level: info
+role::citoid::url:
"//%{hiera('role::mediawiki::hostname')}:%{hiera('citoid::port')}/api"
changeprop::port: 7272
diff --git a/puppet/modules/role/manifests/citoid.pp
b/puppet/modules/role/manifests/citoid.pp
index 6b2bb43..de637f1 100644
--- a/puppet/modules/role/manifests/citoid.pp
+++ b/puppet/modules/role/manifests/citoid.pp
@@ -1,13 +1,15 @@
# == Class: role::citoid
# Provisions Citoid, a MediaWiki extension which adds an auto-
# filled citation tool to VisualEditor using the citoid service.
-class role::citoid {
+class role::citoid(
+ $url,
+) {
include ::role::zotero
include ::citoid
mediawiki::extension { 'Citoid':
settings => {
- wgCitoidServiceUrl => "//{\$wgServer}:${::citoid::port}/api"
+ wgCitoidServiceUrl => $url,
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/307320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec2104cc12df1ed37828b131c6d65a30184a1058
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
