From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Jul 2018 11:50:07 +0000 (+0100)
Subject: Install the CodeEditor extension and configure Sribunto to use it
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1b772d6a33c4776ab4800f1b85db2f20dfbf88b5

Install the CodeEditor extension and configure Sribunto to use it
---

diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index 47e807052..152e843d3 100644
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -23,6 +23,7 @@ property :extension, :kind_of => String, :name_attribute => true
 property :site, :kind_of => String, :required => true
 property :source, :kind_of => String
 property :template, :kind_of => String
+property :template_cookbook, :kind_of => String, :default => "mediawiki"
 property :variables, :kind_of => Hash, :default => {}
 property :version, :kind_of => String
 property :repository, :kind_of => String
@@ -66,7 +67,7 @@ action :create do
 
   if new_resource.template # ~FC023
     declare_resource :template, "#{mediawiki_directory}/LocalSettings.d/Ext-#{new_resource.extension}.inc.php" do
-      cookbook "mediawiki"
+      cookbook new_resource.template_cookbook
       source new_resource.template
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 96cbacaa9..322612d29 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -59,8 +59,14 @@ mediawiki_extension "MobileFrontend" do
   template "mw-ext-MobileFrontend.inc.php.erb"
 end
 
+mediawiki_extension "CodeEditor" do
+  site "wiki.openstreetmap.org"
+end
+
 mediawiki_extension "Scribunto" do
   site "wiki.openstreetmap.org"
+  template "mw-ext-Scribunto.inc.php.erb"
+  template_cookbook "wiki"
 end
 
 cookbook_file "/srv/wiki.openstreetmap.org/osm_logo_wiki.png" do
diff --git a/cookbooks/wiki/templates/default/mw-ext-Scribunto.inc.php.erb b/cookbooks/wiki/templates/default/mw-ext-Scribunto.inc.php.erb
new file mode 100644
index 000000000..2d974f55f
--- /dev/null
+++ b/cookbooks/wiki/templates/default/mw-ext-Scribunto.inc.php.erb
@@ -0,0 +1,10 @@
+<?php
+# DO NOT EDIT - This file is being maintained by Chef
+
+wfLoadExtension('Scribunto');
+
+// Enable syntax highlighting
+$wgScribuntoUseGeSHi = true;
+
+// Use code editor
+$wgScribuntoUseCodeEditor = true;