jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333832 )
Change subject: Add a role for Commons Datasets
..
Add a role for Commons Datasets
Change-Id: I49e1952e15c96fa476f80c31d00b34b5f9faa19b
---
M puppet/hieradata/common.yaml
A puppet/modules/role/manifests/commons_datasets.pp
A puppet/modules/role/templates/commons_datasets/settings.php.erb
3 files changed, 64 insertions(+), 0 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index e2f6195..4bf4a2a 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -321,6 +321,7 @@
role::commons::upload_dir: "%{hiera('mwv::files_dir')}/commonsimages"
+role::commons_datasets::commons_url:
"http://commons%{hiera('mediawiki::multiwiki::base_domain')}%{::port_fragment}/w/api.php"
role::echo::shared_tracking_cluster:
"%{hiera('mediawiki::multiwiki::extension_db_cluster')}"
role::echo::shared_tracking_db:
"%{hiera('mediawiki::multiwiki::extension_cluster_shared_db_name')}"
diff --git a/puppet/modules/role/manifests/commons_datasets.pp
b/puppet/modules/role/manifests/commons_datasets.pp
new file mode 100644
index 000..d961037
--- /dev/null
+++ b/puppet/modules/role/manifests/commons_datasets.pp
@@ -0,0 +1,17 @@
+# class role::commons_datasets
+# Allows to store tabular/spatial data on Commons to be used by Kartographer
+# See https://www.mediawiki.org/wiki/Help:Tabular_Data
+#
+# [*commons_url*]
+# Full URL to api.php of wiki to use as central repository for datasets
+#
+class role::commons_datasets (
+$commons_url,
+) {
+ include ::role::jsonconfig
+ include ::role::commons
+
+ mediawiki::settings { 'commons_datasets':
+ values => template('role/commons_datasets/settings.php.erb'),
+ }
+}
diff --git a/puppet/modules/role/templates/commons_datasets/settings.php.erb
b/puppet/modules/role/templates/commons_datasets/settings.php.erb
new file mode 100644
index 000..aa4cf24
--- /dev/null
+++ b/puppet/modules/role/templates/commons_datasets/settings.php.erb
@@ -0,0 +1,46 @@
+/*https://www.mediawiki.org/wiki/Extension:JsonConfig#Configuration
+$wgJsonConfigModels['Tabular.JsonConfig'] = 'JsonConfig\JCTabularContent';
+$wgJsonConfigs['Tabular.JsonConfig'] = [
+ 'namespace' => 486,
+ 'nsName' => 'Data',
+ // page name must end in ".tab", and contain at least one symbol
+ 'pattern' => '/.\.tab$/',
+ 'license' => 'CC0-1.0+',
+ 'isLocal' => false,
+];
+
+$wgJsonConfigModels['Map.JsonConfig'] = 'JsonConfig\JCMapDataContent';
+$wgJsonConfigs['Map.JsonConfig'] = [
+ 'namespace' => 486,
+ 'nsName' => 'Data',
+ // page name must end in ".map", and contain at least one symbol
+ 'pattern' => '/.\.map$/',
+ 'license' => 'CC0-1.0+',
+ 'isLocal' => false,
+];
+
+if ( $wgDBname === 'commonswiki' ) {
+ // Ensure we have a stable cross-wiki title resolution
+ // See JCSingleton::parseTitle()
+ $wgJsonConfigInterwikiPrefix = "meta";
+ $wgJsonConfigs['Tabular.JsonConfig']['store'] = true;
+ $wgJsonConfigs['Map.JsonConfig']['store'] = true;
+} else {
+ $wgJsonConfigInterwikiPrefix = "commons";
+ $wgJsonConfigs['Tabular.JsonConfig']['remote'] = [
+ 'url' => '<%= @commons_url %>'
+ ];
+ $wgJsonConfigs['Map.JsonConfig']['remote'] = [
+ 'url' => '<%= @commons_url %>'
+ ];
+}
+
+$wgJsonConfigEnableLuaSupport = true;
--
To view, visit https://gerrit.wikimedia.org/r/333832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49e1952e15c96fa476f80c31d00b34b5f9faa19b
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: MaxSem
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
