Update cookbooks

* Replace old nginx cookbook with new chef_nginx cookbooks * Update application cookbook
2017-04-28 11:59:11 +02:00
parent 5d1d4832df
commit 4fb5390f9b
264 changed files with 3050 additions and 8605 deletions
--- a/cookbooks/yum-epel/CHANGELOG.md
+++ b/cookbooks/yum-epel/CHANGELOG.md
@@ -2,9 +2,43 @@

 This file is used to list changes made in each version of the yum-epel cookbook.

+## 2.1.1 (2017-01-05)
+
+- Revert how mirror list strings are generated to fix RHEL 7
+
+## 2.1.0 (2016-12-22)
+
+- Test in Travis using the current build of chef/chef docker image
+- Test on older Chef
+- allow the use of any valid property via attributes
+- fixing tests
+- output versions in the job that is being ran
+- cops
+
+## 2.0.0 (2016-11-26)
+
+- Clarify that we require Chef 12.1+ not 12.0+
+- Use compat_resource instead of the yum cookbook
+- Add integration testing with inspec
+
+## 1.0.2 (2016-10-21)
+
+- Remove upper bound on yum constraint
+
+## 1.0.1 (2016-09-11)
+
+- Fix epel-testing attributes
+
+## 1.0.0 (2016-09-06)
+
+- Add chef_version metadata
+- Testing updates
+- Remove support for Chef 11
+
 ## v0.7.1 (2016-08-19)
+
 - Remove bats testing
- Fix attribute settings 
+- Fix attribute settings
 - Cleanup travis file

 ## v0.7.0 (2016-04-27)
--- a/cookbooks/yum-epel/MAINTAINERS.md
+++ b/cookbooks/yum-epel/MAINTAINERS.md
@@ -2,8 +2,8 @@

 # 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 simple majority of maintainers
-for the relevant subsystems to provide a :+1: on your pull request. Additionally, you need
+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) 
--- a/cookbooks/yum-epel/README.md
+++ b/cookbooks/yum-epel/README.md
@@ -1,4 +1,5 @@
 # yum-epel Cookbook
+
 [![Build Status](https://travis-ci.org/chef-cookbooks/yum-epel.svg?branch=master)](http://travis-ci.org/chef-cookbooks/yum-epel) [![Cookbook Version](https://img.shields.io/cookbook/v/yum-epel.svg)](https://supermarket.chef.io/cookbooks/yum-epel)

 Extra Packages for Enterprise Linux (or EPEL) is a Fedora Special Interest Group that creates, maintains, and manages a high quality set of additional packages for Enterprise Linux, including, but not limited to, Red Hat Enterprise Linux (RHEL), CentOS and Scientific Linux (SL), Oracle Linux (OL).
@@ -6,20 +7,32 @@ Extra Packages for Enterprise Linux (or EPEL) is a Fedora Special Interest Group
 The yum-epel cookbook takes over management of the default repositoryids shipped with epel-release. It allows attribute manipulation of `epel`, `epel-debuginfo`, `epel-source`, `epel-testing`, `epel-testing-debuginfo`, and `epel-testing-source`.

 ## Requirements
+
 ### Platforms
+
 - RHEL/CentOS and derivatives

 ### Chef
- Chef 11+
+
+- Chef 12.1+

 ### Cookbooks
- yum version 3.6.3 or higher
+
+- compat_resource

 ## Attributes
+
 The following attributes are set by default

 ```ruby
-default['yum-epel']['repositories'] = %w{epel epel-debuginfo epel-source epel-testing epel-testing-debuginfo epel-testing-source}
+default['yum-epel']['repos'] = %w(
+  epel
+  epel-debuginfo
+  epel-source
+  epel-testing
+  epel-testing-debuginfo
+  epel-testing-source
+)
 ```

 ```ruby
@@ -139,6 +152,7 @@ include_recipe 'yum-epel'
 ```

 ## License & Authors
+
 **Author:** Cookbook Engineering Team ([cookbooks@chef.io](mailto:cookbooks@chef.io))

 **Copyright:** 2011-2016, Chef Software, Inc.
--- a/cookbooks/yum-epel/attributes/default.rb
+++ b/cookbooks/yum-epel/attributes/default.rb
@@ -1 +1,8 @@
-default['yum-epel']['repositories'] = %w(epel epel-debuginfo epel-source epel-testing epel-testing-debuginfo epel-testing-source)
+default['yum-epel']['repos'] = %w(
+  epel
+  epel-debuginfo
+  epel-source
+  epel-testing
+  epel-testing-debuginfo
+  epel-testing-source
+)
--- a/cookbooks/yum-epel/attributes/epel-debuginfo.rb
+++ b/cookbooks/yum-epel/attributes/epel-debuginfo.rb
@@ -1,12 +1,12 @@
 default['yum']['epel-debuginfo']['repositoryid'] = 'epel-debuginfo'
-default['yum']['epel-debuginfo']['description'] = 'Extra Packages for $releasever - $basearch - Debug'
-
-if node['platform'] == 'amazon'
+default['yum']['epel-debuginfo']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Debug"
+case node['platform']
+when 'amazon'
  default['yum']['epel-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=$basearch'
  default['yum']['epel-debuginfo']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
  default['yum']['epel-debuginfo']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-debuginfo']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
+  default['yum']['epel-debuginfo']['gpgkey'] = "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
 end
 default['yum']['epel-debuginfo']['failovermethod'] = 'priority'
 default['yum']['epel-debuginfo']['gpgcheck'] = true
--- a/cookbooks/yum-epel/attributes/epel-source.rb
+++ b/cookbooks/yum-epel/attributes/epel-source.rb
@@ -1,13 +1,13 @@
 default['yum']['epel-source']['repositoryid'] = 'epel-source'
-default['yum']['epel-source']['description'] = 'Extra Packages for $releasever - $basearch - Source'
-if node['platform'] == 'amazon'
+default['yum']['epel-source']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Source"
+case node['platform']
+when 'amazon'
  default['yum']['epel-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-6&arch=$basearch'
  default['yum']['epel-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
  default['yum']['epel-source']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-source-#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-source']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
+  default['yum']['epel-source']['gpgkey'] = "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
 end
-
 default['yum']['epel-source']['failovermethod'] = 'priority'
 default['yum']['epel-source']['gpgcheck'] = true
 default['yum']['epel-source']['enabled'] = false
--- a/cookbooks/yum-epel/attributes/epel-testing-debuginfo.rb
+++ b/cookbooks/yum-epel/attributes/epel-testing-debuginfo.rb
@@ -1,13 +1,13 @@
 default['yum']['epel-testing-debuginfo']['repositoryid'] = 'epel-testing-debuginfo'
-default['yum']['epel-testing-debuginfo']['description'] = 'Extra Packages for $releasever - $basearch - Testing Debug'
-if node['platform'] == 'amazon'
+default['yum']['epel-testing-debuginfo']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing Debug"
+case node['platform']
+when 'amazon'
  default['yum']['epel-testing-debuginfo']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel6&arch=$basearch'
  default['yum']['epel-testing-debuginfo']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
  default['yum']['epel-testing-debuginfo']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-debug-epel#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-testing-debuginfo']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
+  default['yum']['epel-testing-debuginfo']['gpgkey'] = "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
 end
-
 default['yum']['epel-testing-debuginfo']['failovermethod'] = 'priority'
 default['yum']['epel-testing-debuginfo']['gpgcheck'] = true
 default['yum']['epel-testing-debuginfo']['enabled'] = false
--- a/cookbooks/yum-epel/attributes/epel-testing-source.rb
+++ b/cookbooks/yum-epel/attributes/epel-testing-source.rb
@@ -1,11 +1,12 @@
 default['yum']['epel-testing-source']['repositoryid'] = 'epel-testing-source'
-default['yum']['epel-testing-source']['description'] = 'Extra Packages for $releasever - $basearch - Testing Source'
-if node['platform'] == 'amazon'
+default['yum']['epel-testing-source']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing Source"
+case node['platform']
+when 'amazon'
  default['yum']['epel-testing-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel6&arch=$basearch'
  default['yum']['epel-testing-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
  default['yum']['epel-testing-source']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-testing-source']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
+  default['yum']['epel-testing-source']['gpgkey'] = "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
 end
 default['yum']['epel-testing-source']['failovermethod'] = 'priority'
 default['yum']['epel-testing-source']['gpgcheck'] = true
--- a/cookbooks/yum-epel/attributes/epel-testing.rb
+++ b/cookbooks/yum-epel/attributes/epel-testing.rb
@@ -1,13 +1,13 @@
 default['yum']['epel-testing']['repositoryid'] = 'epel-testing'
-default['yum']['epel-testing']['description'] = 'Extra Packages for $releasever - $basearch - Testing '
-if node['platform'] == 'amazon'
-  default['yum']['epel-testing-source']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=$basearch'
-  default['yum']['epel-testing-source']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
+default['yum']['epel-testing']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch - Testing "
+case node['platform']
+when 'amazon'
+  default['yum']['epel-testing']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=$basearch'
+  default['yum']['epel-testing']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
 else
-  default['yum']['epel-testing-source']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-source-epel#{node['platform_version'].to_i}&arch=$basearch"
-  default['yum']['epel-testing-source']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
+  default['yum']['epel-testing']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel#{node['platform_version'].to_i}&arch=$basearch"
+  default['yum']['epel-testing']['gpgkey'] = "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
 end
-
 default['yum']['epel-testing']['failovermethod'] = 'priority'
 default['yum']['epel-testing']['gpgcheck'] = true
 default['yum']['epel-testing']['enabled'] = false
--- a/cookbooks/yum-epel/attributes/epel.rb
+++ b/cookbooks/yum-epel/attributes/epel.rb
@@ -1,20 +1,19 @@
 default['yum']['epel']['repositoryid'] = 'epel'
-default['yum']['epel']['description'] = 'Extra Packages for $releasever - $basearch'
-
+default['yum']['epel']['description'] = "Extra Packages for #{node['platform_version'].to_i} - $basearch"
 case node['kernel']['machine']
 when 's390x'
  default['yum']['epel']['baseurl'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/'
  default['yum']['epel']['gpgkey'] = 'https://kojipkgs.fedoraproject.org/rhel/rc/7/Server/s390x/os/RPM-GPG-KEY-redhat-release'
 else
-  if node['platform'] == 'amazon'
+  case node['platform']
+  when 'amazon'
    default['yum']['epel']['mirrorlist'] = 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'
    default['yum']['epel']['gpgkey'] = 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
  else
    default['yum']['epel']['mirrorlist'] = "http://mirrors.fedoraproject.org/mirrorlist?repo=epel-#{node['platform_version'].to_i}&arch=$basearch"
-    default['yum']['epel']['gpgkey'] = (node['platform_version'].to_i == 5 ? 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL' : "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}")
+    default['yum']['epel']['gpgkey'] = "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{node['platform_version'].to_i}"
  end
 end
-
 default['yum']['epel']['failovermethod'] = 'priority'
 default['yum']['epel']['gpgcheck'] = true
 default['yum']['epel']['enabled'] = true
--- a/cookbooks/yum-epel/metadata.json
+++ b/cookbooks/yum-epel/metadata.json
--- a/cookbooks/yum-epel/recipes/default.rb
+++ b/cookbooks/yum-epel/recipes/default.rb
@@ -1,9 +1,9 @@
 #
 # Author:: Sean OMeara (<someara@chef.io>)
-# Cookbook Name:: yum-epel
+# Cookbook:: yum-epel
 # Recipe:: default
 #
-# Copyright 2013-2016, Chef Software, Inc.
+# Copyright:: 2013-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,46 +17,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-node['yum-epel']['repositories'].each do |repo|
+node['yum-epel']['repos'].each do |repo|
  next unless node['yum'][repo]['managed']
-
  yum_repository repo do
-    baseurl node['yum'][repo]['baseurl'] unless node['yum'][repo]['baseurl'].nil?
-    cost node['yum'][repo]['cost'] unless node['yum'][repo]['cost'].nil?
-    description node['yum'][repo]['description'] unless node['yum'][repo]['description'].nil?
-    enabled node['yum'][repo]['enabled'] unless node['yum'][repo]['enabled'].nil?
-    enablegroups node['yum'][repo]['enablegroups'] unless node['yum'][repo]['enablegroups'].nil?
-    exclude node['yum'][repo]['exclude'] unless node['yum'][repo]['exclude'].nil?
-    failovermethod node['yum'][repo]['failovermethod'] unless node['yum'][repo]['failovermethod'].nil?
-    fastestmirror_enabled node['yum'][repo]['fastestmirror_enabled'] unless node['yum'][repo]['fastestmirror_enabled'].nil?
-    gpgcheck node['yum'][repo]['gpgcheck'] unless node['yum'][repo]['gpgcheck'].nil?
-    gpgkey node['yum'][repo]['gpgkey'] unless node['yum'][repo]['gpgkey'].nil?
-    http_caching node['yum'][repo]['http_caching'] unless node['yum'][repo]['http_caching'].nil?
-    include_config node['yum'][repo]['include_config'] unless node['yum'][repo]['include_config'].nil?
-    includepkgs node['yum'][repo]['includepkgs'] unless node['yum'][repo]['includepkgs'].nil?
-    keepalive node['yum'][repo]['keepalive'] unless node['yum'][repo]['keepalive'].nil?
-    make_cache node['yum'][repo]['make_cache'] unless node['yum'][repo]['make_cache'].nil?
-    max_retries node['yum'][repo]['max_retries'] unless node['yum'][repo]['max_retries'].nil?
-    metadata_expire node['yum'][repo]['metadata_expire'] unless node['yum'][repo]['metadata_expire'].nil?
-    mirror_expire node['yum'][repo]['mirror_expire'] unless node['yum'][repo]['mirror_expire'].nil?
-    mirrorlist node['yum'][repo]['mirrorlist'] unless node['yum'][repo]['mirrorlist'].nil?
-    mirrorlist_expire node['yum'][repo]['mirrorlist_expire'] unless node['yum'][repo]['mirrorlist_expire'].nil?
-    password node['yum'][repo]['password'] unless node['yum'][repo]['password'].nil?
-    priority node['yum'][repo]['priority'] unless node['yum'][repo]['priority'].nil?
-    proxy node['yum'][repo]['proxy'] unless node['yum'][repo]['proxy'].nil?
-    proxy_username node['yum'][repo]['proxy_username'] unless node['yum'][repo]['proxy_username'].nil?
-    proxy_password node['yum'][repo]['proxy_password'] unless node['yum'][repo]['proxy_password'].nil?
-    report_instanceid node['yum'][repo]['report_instanceid'] unless node['yum'][repo]['report_instanceid'].nil?
-    repositoryid node['yum'][repo]['repositoryid'] unless node['yum'][repo]['repositoryid'].nil?
-    skip_if_unavailable node['yum'][repo]['skip_if_unavailable'] unless node['yum'][repo]['skip_if_unavailable'].nil?
-    source node['yum'][repo]['source'] unless node['yum'][repo]['source'].nil?
-    sslcacert node['yum'][repo]['sslcacert'] unless node['yum'][repo]['sslcacert'].nil?
-    sslclientcert node['yum'][repo]['sslclientcert'] unless node['yum'][repo]['sslclientcert'].nil?
-    sslclientkey node['yum'][repo]['sslclientkey'] unless node['yum'][repo]['sslclientkey'].nil?
-    sslverify node['yum'][repo]['sslverify'] unless node['yum'][repo]['sslverify'].nil?
-    timeout node['yum'][repo]['timeout'] unless node['yum'][repo]['timeout'].nil?
-    username node['yum'][repo]['username'] unless node['yum'][repo]['username'].nil?
-
-    action :create
+    node['yum'][repo].each do |config, value|
+      send(config.to_sym, value) unless value.nil? || config == 'managed'
+    end
  end
 end