Use sysment pygmentize for SyntaxHighlight extension

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d566e2bccb3ef4c0be8ad081759795b32aa0a36e..f651adfb9e8d53e333229a7bafa131009db682b0 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,7 +13,7 @@ Metrics/AbcSize:
 # Offense count: 27
 # Configuration parameters: CountComments.
 Metrics/BlockLength:
-  Max: 359
+  Max: 360
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:

diff --git a/cookbooks/mediawiki/providers/site.rb b/cookbooks/mediawiki/providers/site.rb
index 24b53c8faed420473759fb3b2ef0f9b46f45566f..054bbe3c002687ff449452a853e463996cef14a1 100644 (file)
--- a/cookbooks/mediawiki/providers/site.rb
+++ b/cookbooks/mediawiki/providers/site.rb
@@ -276,6 +276,7 @@ action :create do
 
   mediawiki_extension "SyntaxHighlight_GeSHi" do
     site new_resource.name
+    template "mw-ext-SyntaxHighlight.inc.php.erb"
     update_site false
   end
 

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 2ecaaa4ebe5f30dacc53ea8f4304b4694bfbe0a7..9e9d7e75b96a735b4206cb9f0683d901df8b1567 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -51,6 +51,9 @@ package "liblz4-tool"
 package "curl"
 package "parsoid"
 
+# Mediawiki packages for SyntaxHighight support
+package "python-pygments"
+
 template "/etc/mediawiki/parsoid/settings.js" do
   source "parsoid-settings.js.erb"
   owner "root"

diff --git a/cookbooks/mediawiki/templates/default/mw-ext-SyntaxHighlight.inc.php.erb b/cookbooks/mediawiki/templates/default/mw-ext-SyntaxHighlight.inc.php.erb
new file mode 100644 (file)
index 0000000..554e820
--- /dev/null
+++ b/cookbooks/mediawiki/templates/default/mw-ext-SyntaxHighlight.inc.php.erb
@@ -0,0 +1,4 @@
+<?php
+# DO NOT EDIT - This file is being maintained by Chef
+wfLoadExtension( 'SyntaxHighlight_GeSHi' );
+$wgPygmentizePath = '/usr/bin/pygmentize';