Update the mediawiki cookbook and upstream cookbooks

Compatibility with Chef 14

cookbooks/dmg/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 This file is used to list changes made in each version of the dmg cookbook.
 
+## 4.1.1 (2018-04-06)
+
+- The dmg_package resource is now included in Chef 14 and this cookbook has been deprecated. We highly recommend updating to Chef 14 so you can use this resource without the need for a cookbook dependency.
+- Validate the type field in the resource
+- Remove the now autogenerated ChefSpec matchers
+
+## 4.1.0 (2017-11-15)
+
+- Adds allow_untrusted property for older packages that aren't signed
+- Resolve Chef 14 deprecation warnings
+- Minor testing updates and cleanup
+
 ## 4.0.0 (2017-04-27)
 
 - Converted the existing LWRP to a custom resource which increases the required chef-client release to 12.5+

cookbooks/dmg/MAINTAINERS.md

@@ -1,18 +0,0 @@
-<!-- This is a generated file. Please do not edit directly -->
-
-# Maintainers
-This file lists how this cookbook project is maintained. When making changes to the system, this
-file tells you who needs to review your patch - you need a review from an existing maintainer
-for the cookbook to provide a :+1: on your pull request. Additionally, you need
-to not receive a veto from a Lieutenant or the Project Lead.
-
-Check out [How Cookbooks are Maintained](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/CONTRIBUTING.MD) 
-for details on the process and how to become a maintainer or the project lead.
-
-# Project Maintainer
-* [Tim Smith](https://github.com/tas50)
-
-# Maintainers
-* [Jennifer Davis](https://github.com/sigje)
-* [Tim Smith](https://github.com/tas50)
-* [Thom May](https://github.com/thommay)

cookbooks/dmg/README.md

@@ -1,3 +1,5 @@
+The dmg_package resource is now included in Chef 14 and this cookbook has been deprecated. We highly recommend updating to Chef 14 so you can use this resource without the need for a cookbook dependency.
+
 # dmg Cookbook
 
 [![Build Status](https://travis-ci.org/chef-cookbooks/dmg.svg?branch=master)](https://travis-ci.org/chef-cookbooks/dmg) [![Cookbook Version](https://img.shields.io/cookbook/v/dmg.svg)](https://supermarket.chef.io/cookbooks/dmg)
@@ -49,6 +51,7 @@ Optionally, the LWRP can install an "mpkg" or "pkg" package using installer(8).
 - `dmg_passphrase` - Specify a passphrase to use to unencrypt the dmg while mounting.
 - `accept_eula` - Specify whether to accept the EULA. Certain dmgs require acceptance of EULA before mounting. Can be true or false, defaults to false.
 - `headers` - Allows custom HTTP headers (like cookies) to be set on the remote_file resource.
+- `allow_untrusted` - Allows packages with untrusted certs to be installed.
 
 #### Examples
 

cookbooks/dmg/libraries/matchers.rb

@@ -1,24 +0,0 @@
-#
-# Cookbook:: dmg
-# Library:: matchers
-#
-# Copyright:: 2014-2017, Fletcher Nichol <fnichol@nichol.ca>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-if defined?(ChefSpec)
-  def install_dmg_package(app)
-    ChefSpec::Matchers::ResourceMatcher.new(:dmg_package, :install, app)
-  end
-end

cookbooks/dmg/resources/package.rb

@@ -26,12 +26,13 @@ property :destination, String, default: '/Applications'
 property :checksum, String
 property :volumes_dir, String
 property :dmg_name, String
-property :type, String, default: 'app'
+property :type, String, default: 'app', equal_to: %w(app pkg mpkg)
 property :installed, [true, false], default: false, desired_state: false
 property :package_id, String
 property :dmg_passphrase, String
 property :accept_eula, [true, false], default: false
 property :headers, [Hash, nil], default: nil
+property :allow_untrusted, [true, false], default: false
 
 load_current_value do |new_resource|
   if ::File.directory?("#{new_resource.destination}/#{new_resource.app}.app")
@@ -87,7 +88,10 @@ action :install do
         ignore_failure true
       end
     when 'mpkg', 'pkg'
-      execute "installation_file=$(ls '/Volumes/#{volumes_dir}' | grep '.#{new_resource.type}$') && sudo installer -pkg \"/Volumes/#{volumes_dir}/$installation_file\" -target /" do
+      install_cmd = "installation_file=$(ls '/Volumes/#{volumes_dir}' | grep '.#{new_resource.type}$') && sudo installer -pkg \"/Volumes/#{volumes_dir}/$installation_file\" -target /"
+      install_cmd += ' -allowUntrusted' if new_resource.allow_untrusted
+
+      execute install_cmd do
         # Prevent cfprefsd from holding up hdiutil detach for certain disk images
         environment('__CFPREFERENCES_AVOID_DAEMON' => '1')
       end