[MediaWiki-commits] [Gerrit] Add GlobalCssJs role - change (mediawiki/vagrant)

2014-07-24 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Add GlobalCssJs role
..


Add GlobalCssJs role

Change-Id: I83602a6594b20da5fa9c9ac157a516f4fc298824
---
A puppet/manifests/roles/globalcssjs.pp
1 file changed, 36 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/manifests/roles/globalcssjs.pp 
b/puppet/manifests/roles/globalcssjs.pp
new file mode 100644
index 000..23a0ae2
--- /dev/null
+++ b/puppet/manifests/roles/globalcssjs.pp
@@ -0,0 +1,36 @@
+# == Class: role::globalcssjs
+# This role installs the GlobalCssJs extension on top of
+# the CentralAuth extension. It additionally adds a
+# globalcssjstest.wiki.local.wmftest.net which will also
+# load your global scripts.
+#
+class role::globalcssjs {
+require ::role::mediawiki
+include ::role::centralauth
+
+$common_settings = [
+  \$wgResourceLoaderSources['wiki']['apiScript'] = 
'http://127.0.0.1:${::forwarded_port}/w/api.php';,
+  \$wgResourceLoaderSources['wiki']['loadScript'] = 
'http://127.0.0.1:${::forwarded_port}/w/load.php';,
+  '$wgGlobalCssJsConfig[wiki] = wiki;',
+  '$wgGlobalCssJsConfig[source] = wiki;',
+]
+
+mediawiki::extension { 'GlobalCssJs':
+settings = $common_settings,
+}
+
+multiwiki::wiki{ 'globalcssjstest': }
+
+role::globalcssjs::multiwiki { 'globalcssjstest': }
+}
+
+# == Define: ::role::globalcssjs::multiwiki
+# Configure a multiwiki instance for GlobalCssJs.
+#
+define role::globalcssjs::multiwiki {
+$wiki = $title
+
+multiwiki::extension { ${wiki}:GlobalCssJs:
+settings = $::role::globalcssjs::common_settings,
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/148920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I83602a6594b20da5fa9c9ac157a516f4fc298824
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Add GlobalCssJs role - change (mediawiki/vagrant)

2014-07-23 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/148920

Change subject: Add GlobalCssJs role
..

Add GlobalCssJs role

Change-Id: I83602a6594b20da5fa9c9ac157a516f4fc298824
---
A puppet/manifests/roles/globalcssjs.pp
1 file changed, 37 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/20/148920/1

diff --git a/puppet/manifests/roles/globalcssjs.pp 
b/puppet/manifests/roles/globalcssjs.pp
new file mode 100644
index 000..f44b09f
--- /dev/null
+++ b/puppet/manifests/roles/globalcssjs.pp
@@ -0,0 +1,37 @@
+# == Class: role::globalcssjs
+# This role installs the GlobalCssJs extension on top of
+# the CentralAuth extension. It additionally adds a
+# globalcssjstest.wiki.wmftest.net which will also
+# load your global scripts.
+#
+class role::globalcssjs {
+require ::role::mediawiki
+include ::role::centralauth
+
+$common_settings = [
+  '$wgResourceLoaderSources[wiki][apiScript] = 
http://localhost:8080/w/api.php;;',
+  '$wgResourceLoaderSources[wiki][loadScript] = 
http://localhost:8080/w/load.php;;',
+  '$wgGlobalCssJsConfig[wiki] = wiki;',
+  '$wgGlobalCssJsConfig[source] = wiki;',
+]
+
+mediawiki::extension { 'GlobalCssJs':
+settings = $common_settings,
+}
+
+multiwiki::wiki{ 'globalcssjstest': }
+
+role::globalcssjs::multiwiki { 'globalcssjstest': }
+}
+
+# == Define: ::role::globalcssjs::multiwiki
+# Configure a multiwiki instance for GlobalCssJs.
+#
+define role::globalcssjs::multiwiki {
+$wiki = $title
+$wikidb = ${wiki}wiki
+
+multiwiki::extension { ${wiki}:GlobalCssJs:
+settings = $::role::globalcssjs::common_settings,
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/148920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83602a6594b20da5fa9c9ac157a516f4fc298824
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits