Update formatting of header comments

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

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index b7654f3e8c383a150f5f03b571f337ee4096ec7a..27c7cb48fe1b228a4b076345c67b78774fbb2c5a 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: mediawiki
+# Cookbook:: mediawiki

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -32,6 +32,8 @@ package %w[
   php-mbstring
   php-mysql
   php-xml
   php-mbstring
   php-mysql
   php-xml

+  php-zip
+  composer

 ]
 
 # Mediawiki enhanced difference engine
 ]
 
 # Mediawiki enhanced difference engine


@@ -82,15 +84,9 @@ service "parsoid" do
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 
   subscribes :restart, "template[/etc/mediawiki/parsoid/config.yaml]"
 end
 

-php_version = if node[:lsb][:release].to_f >= 18.04
-                "7.2"
-              else
-                "7.0"
-              end
+apache_module "php7.2"

 
 

-apache_module "php#{php_version}"
-
-link "/etc/php/#{php_version}/apache2/conf.d/20-wikidiff2.ini" do
+link "/etc/php/7.2/apache2/conf.d/20-wikidiff2.ini" do

   to "../../mods-available/wikidiff2.ini"
 end
 
   to "../../mods-available/wikidiff2.ini"
 end