mediawiki: parsoid switch to yaml config

[chef.git] / cookbooks / mediawiki / recipes / default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b9806477c329611ccb34ef2cf5cb76364f6c938a..b31db999d58ef5889089efd0c5f9f026c1c65fb7 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -18,20 +18,21 @@
 #
 
 include_recipe "memcached"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "mysql"
 include_recipe "git"
 
 # Mediawiki Base Requirements
-package "php5"
-package "php5-cli"
-package "php5-curl"
-package "php5-mysql"
-package "php5-gd"
-package "php-apc"
-package "php5-intl"
-package "libapache2-mod-php5"
+package "php"
+package "php-cli"
+package "php-curl"
+package "php-gd"
+package "php-intl"
+package "php-mbstring"
+package "php-mysql"
+package "php-xml"
 
+# Mediawiki enhanced difference engine
 package "php-wikidiff2"
 
 # Mediawiki Image + SVG support
@@ -50,22 +51,35 @@ package "liblz4-tool"
 package "curl"
 package "parsoid"
 
-template "/etc/mediawiki/parsoid/settings.js" do
-  source "parsoid-settings.js.erb"
+# Mediawiki packages for SyntaxHighight support
+package "python-pygments"
+
+file "/usr/lib/parsoid/lib" do
+  action :delete
+end
+
+file "/etc/mediawiki/parsoid/settings.js" do
+  action :delete
+end
+
+template "/etc/mediawiki/parsoid/config.yaml" do
+  source "parsoid-config.yaml.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 service "parsoid" do
   action [:enable]
   supports :status => false, :restart => true, :reload => false
-  subscribes :restart, "template[/etc/mediawiki/parsoid/settings.js]"
+  subscribes :restart, "file[/etc/mediawiki/parsoid/settings.js]"
+  subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
-link "/etc/php5/apache2/conf.d/20-wikidiff2.ini" do
+apache_module "php7.0"
+
+link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do
   to "../../mods-available/wikidiff2.ini"
 end
 
-apache_module "php5"
 apache_module "rewrite"