madscience 0.0.4 → 0.0.5

data/cookbooks/windows/providers/path.rb

@@ -1,5 +1,5 @@
 #
-# Author:: Paul Morotn (<pmorton@biaprotect.com>)
+# Author:: Paul Morton (<pmorton@biaprotect.com>)
 # Cookbook Name:: windows
 # Provider:: path
 #
@@ -17,19 +17,36 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+use_inline_resources if defined?(use_inline_resources)
+
+include Windows::Helper
 
 action :add do
-  env "PATH" do
+  env "path" do
     action :modify
     delim ::File::PATH_SEPARATOR
     value new_resource.path
+    notifies :run, "ruby_block[fix ruby ENV['PATH']]", :immediately
+  end
+
+  # The windows Env provider does not correctly expand variables in 
+  # the PATH environment variable. Ruby expects these to be expanded.
+  # This is a temporary fix for that.
+  #
+  # Follow at https://github.com/opscode/chef/pull/1876
+  #
+  ruby_block "fix ruby ENV['PATH']" do
+    block do
+      ENV['PATH'] = expand_env_vars(ENV['PATH'])
+    end
+    action :nothing
   end
 end
 
 action :remove do
-  env "PATH" do
+  env "path" do
     action :delete
     delim ::File::PATH_SEPARATOR
     value new_resource.path
   end
-end
+end

data/cookbooks/windows/providers/printer.rb

@@ -17,6 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+use_inline_resources if defined?(use_inline_resources)
 
 # Support whyrun
 def whyrun_supported?

data/cookbooks/windows/providers/printer_port.rb

@@ -17,6 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+use_inline_resources if defined?(use_inline_resources)
 
 # Support whyrun
 def whyrun_supported?

data/cookbooks/windows/providers/reboot.rb

@@ -22,10 +22,12 @@ action :request do
   node.run_state[:reboot_requested] = true
   node.run_state[:reboot_timeout] = @new_resource.timeout
   node.run_state[:reboot_reason] = @new_resource.reason
+  new_resource.updated_by_last_action(true)
 end
 
 action :cancel do
   node.run_state.delete(:reboot_requested)
   node.run_state.delete(:reboot_timeout)
   node.run_state.delete(:reboot_reason)
+  new_resource.updated_by_last_action(true)
 end

data/cookbooks/windows/providers/registry.rb

@@ -25,11 +25,13 @@
 include Windows::RegistryHelper
 
 action :create do
-  registry_update(:create)
+  updated = registry_update(:create)
+  new_resource.updated_by_last_action(updated)
 end
 
 action :modify do
-  registry_update(:open)
+  updated = registry_update(:open)
+  new_resource.updated_by_last_action(updated)
 end
 
 action :force_modify do
@@ -46,9 +48,11 @@ action :force_modify do
         else
           Chef::Log.debug("#{@new_resource} value [#{value_name}] current [#{current_value_data}] data not equal to desired [#{desired_value_data}] data. Setting value and restarting check loop.")
           begin
-            registry_update(:open)
+            updated = registry_update(:open)
+            new_resource.updated_by_last_action(updated)
           rescue Exception
-            registry_update(:create)
+            updated = registry_update(:create)
+            new_resource.updated_by_last_action(updated)
           end
           i=0 # start count loop over
         end
@@ -60,6 +64,7 @@ end
 
 action :remove do
   delete_value(@new_resource.key_name,@new_resource.values)
+  new_resource.updated_by_last_action(true)
 end
 
 private
@@ -67,6 +72,4 @@ def registry_update(mode)
 
   Chef::Log.debug("Registry Mode (#{mode})")
   updated = set_value(mode,@new_resource.key_name,@new_resource.values,@new_resource.type)
-  @new_resource.updated_by_last_action(updated)
-
 end

data/cookbooks/windows/providers/task.rb

@@ -38,7 +38,7 @@ action :create do
     cmd += "/RP \"#{@new_resource.password}\" " if @new_resource.user and @new_resource.password
     cmd += "/RL HIGHEST " if @new_resource.run_level == :highest
     shell_out!(cmd, {:returns => [0]})
-    @new_resource.updated_by_last_action true
+    new_resource.updated_by_last_action true
     Chef::Log.info "#{@new_resource} task created"
   end
 end
@@ -50,7 +50,7 @@ action :run do
     else
       cmd = "schtasks /Run /TN \"#{@current_resource.name}\""
       shell_out!(cmd, {:returns => [0]})
-      @new_resource.updated_by_last_action true
+      new_resource.updated_by_last_action true
       Chef::Log.info "#{@new_resource} task ran"
     end
   else
@@ -68,7 +68,7 @@ action :change do
       Chef::Log.fatal "#{@new_resource.name}: Can't specify user or password without both!"
     end
     shell_out!(cmd, {:returns => [0]})
-    @new_resource.updated_by_last_action true
+    new_resource.updated_by_last_action true
     Chef::Log.info "Change #{@new_resource} task ran"
   else
     Chef::Log.debug "#{@new_resource} task doesn't exists - nothing to do"
@@ -80,13 +80,47 @@ action :delete do
     use_force = @new_resource.force ? '/F' : ''
     cmd = "schtasks /Delete #{use_force} /TN \"#{@current_resource.name}\""
     shell_out!(cmd, {:returns => [0]})
-    @new_resource.updated_by_last_action true
+    new_resource.updated_by_last_action true
     Chef::Log.info "#{@new_resource} task deleted"
   else
     Chef::Log.debug "#{@new_resource} task doesn't exists - nothing to do"
   end
 end
 
+action :enable do
+  if @current_resource.exists
+    if @current_resource.enabled
+      Chef::Log.debug "#{@new_resource} already enabled - nothing to do"
+    else
+      cmd =  "schtasks /Change /TN \"#{@current_resource.name}\" "
+      cmd += "/ENABLE"
+      shell_out!(cmd, {:returns => [0]})
+      @new_resource.updated_by_last_action true
+      Chef::Log.info "#{@new_resource} task enabled"
+    end
+  else
+    Chef::Log.fatal "#{@new_resource} task doesn't exist - nothing to do"
+    raise Errno::ENOENT, "#{@new_resource}: task does not exist, cannot enable"
+  end
+end
+
+action :disable do
+  if @current_resource.exists
+    if @current_resource.enabled
+      cmd =  "schtasks /Change /TN \"#{@current_resource.name}\" "
+      cmd += "/DISABLE"
+      shell_out!(cmd, {:returns => [0]})
+      @new_resource.updated_by_last_action true
+      Chef::Log.info "#{@new_resource} task disabled"
+    else
+      Chef::Log.debug "#{@new_resource} already disabled - nothing to do"
+    end
+  else
+    Chef::Log.debug "#{@new_resource} task doesn't exist - nothing to do"
+  end
+end
+
+
 def load_current_resource
   @current_resource = Chef::Resource::WindowsTask.new(@new_resource.name)
   @current_resource.name(@new_resource.name)
@@ -97,6 +131,9 @@ def load_current_resource
     if task_hash[:Status] == "Running"
       @current_resource.status = :running
     end
+    if task_hash[:ScheduledTaskState] == "Enabled"
+      @current_resource.enabled = true
+    end
     @current_resource.cwd(task_hash[:Folder])
     @current_resource.command(task_hash[:TaskToRun])
     @current_resource.user(task_hash[:RunAsUser])
@@ -107,7 +144,9 @@ private
 
 def load_task_hash(task_name)
   Chef::Log.debug "looking for existing tasks"
-  output = `schtasks /Query /FO LIST /V /TN \"#{task_name}\" 2> NUL`
+
+  # we use shell_out here instead of shell_out! because a failure implies that the task does not exist
+  output = shell_out("schtasks /Query /FO LIST /V /TN \"#{task_name}\"").stdout
   if output.empty?
     task = false
   else

data/cookbooks/windows/providers/zipfile.rb

@@ -2,7 +2,7 @@
 # Author:: Doug MacEachern (<dougm@vmware.com>)
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Cookbook Name:: windows
-# Provider:: unzip
+# Provider:: zipfile
 #
 # Copyright:: 2010, VMware, Inc.
 # Copyright:: 2011, Opscode, Inc.
@@ -38,7 +38,7 @@ action :unzip do
       zip.extract(entry, path)
     end
   end
-  @new_resource.updated_by_last_action(true)
+  new_resource.updated_by_last_action(true)
 end
 
 action :zip do
@@ -71,6 +71,7 @@ action :zip do
         z.add(zip_fname, f)
       end
       z.close
+      new_resource.updated_by_last_action(true)
     else
       Chef::Log.info("Single directory must be specified for compression, and #{@new_resource.source} does not meet that criteria.")
     end

data/cookbooks/windows/recipes/reboot_handler.rb

@@ -27,6 +27,6 @@ end
 chef_handler 'WindowsRebootHandler' do
   source "#{node['chef_handler']['handler_path']}/windows_reboot_handler.rb"
   arguments node['windows']['allow_pending_reboots']
-  supports :report => true, :exception => false
+  supports :report => true, :exception => node['windows']['allow_reboot_on_failure']
   action :enable
 end

data/cookbooks/windows/resources/auto_run.rb

@@ -1,5 +1,5 @@
 #
-# Author:: Paul Morotn (<pmorton@biaprotect.com>)
+# Author:: Paul Morton (<pmorton@biaprotect.com>)
 # Cookbook Name:: windows
 # Resource:: auto_run
 #

data/cookbooks/windows/resources/font.rb

@@ -0,0 +1,25 @@
+#
+# Author:: Sander Botman <sbotman@schubergphilis.com>
+# Cookbook Name:: windows
+# Resource:: font
+#
+# Copyright:: 2014, Schuberg Philis BV.
+#
+# 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.
+#
+
+actions :install
+
+default_action :install
+
+attribute :file, :kind_of => String, :name_attribute => true

data/cookbooks/windows/resources/path.rb

@@ -1,5 +1,5 @@
 #
-# Author:: Paul Morotn (<pmorton@biaprotect.com>)
+# Author:: Paul Morton (<pmorton@biaprotect.com>)
 # Cookbook Name:: windows
 # Resource:: path
 #

data/cookbooks/windows/resources/task.rb

@@ -20,9 +20,9 @@
 
 # Passwords can't be loaded for existing tasks, making :modify both confusing
 # and not very useful
-actions :create, :delete, :run, :change
+actions :create, :delete, :run, :change, :enable, :disable
 
-attribute :name, :kind_of => String, :name_attribute => true
+attribute :name, :kind_of => String, :name_attribute => true, :regex => [ /\A[^\\\/\:\*\?\<\>\|]+\z/ ]
 attribute :command, :kind_of => String
 attribute :cwd, :kind_of => String
 attribute :user, :kind_of => String, :default => nil
@@ -42,7 +42,7 @@ attribute :frequency, :equal_to => [:minute,
 attribute :start_day, :kind_of => String, :default => nil
 attribute :start_time, :kind_of => String, :default => nil
 
-attr_accessor :exists, :status
+attr_accessor :exists, :status, :enabled
 
 def initialize(name, run_context=nil)
   super

data/cookbooks/windows/resources/zipfile.rb

@@ -2,7 +2,7 @@
 # Author:: Doug MacEachern (<dougm@vmware.com>)
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Cookbook Name:: windows
-# Resource:: unzip
+# Resource:: zipfile
 #
 # Copyright:: 2010, VMware, Inc.
 # Copyright:: 2011, Opscode, Inc.

data/cookbooks/yum/CHANGELOG.md

@@ -2,6 +2,48 @@ yum Cookbook CHANGELOG
 ======================
 This file is used to list changes made in each version of the yum cookbook.
 
+v3.5.1 (2014-11-24)
+-------------------
+- Reverting management of ca-certificates because EL5 was broken
+
+v3.5.0 (2014-11-24)
+-------------------
+- Adding management of ca-certificates package to yum_repository provider
+
+v3.4.1 (2014-10-29)
+-------------------
+- Run yum-makecache only_if new_resource.enabled
+- Allow setting of reposdir in global yum config and man page
+- Change default 'obsoletes' behavior to match yum defaults
+
+v3.4.0 (2014-10-15)
+-------------------
+- Dynamically generate the new_resource attributes
+
+v3.3.2 (2014-09-11)
+-------------------
+- Fix globalconfig resource param for http_caching
+
+v3.3.1 (2014-09-04)
+-------------------
+- Fix issue with sslverify if set to false
+- Add fancy badges
+
+v3.3.0 (2014-09-03)
+-------------------
+- Adding tuning attributes for all supported resource parameters
+- Adding options hash parameter
+- Adding (real) rhel-6.5 and centos-7.0 to test-kitchen coverage
+- Updating regex for mirror_expire and mirrorlist_expire to include /^\d+[mhd]$/
+- Updating README so keepcache reflects reality (defaults to false)
+- Changing 'obsoletes' behavior in globalconfig resource to match
+  default behavior. (now defaults to nil, yum defaults to false)
+- Adding makecache action to repository resource
+- Adding mode parameter to repository resource. Defaults to '0644'.
+
+v3.2.4 (2014-08-20)
+-------------------
+#82 - Adding a makecache parameter
 
 v3.2.2 (2014-06-11)
 -------------------

data/cookbooks/yum/README.md

@@ -1,6 +1,9 @@
 yum Cookbook
 ============
 
+[![Cookbook Version](https://img.shields.io/cookbook/v/yum.svg)](https://supermarket.getchef.com/cookbooks/yum)
+[![Travis status](http://img.shields.io/travis/opscode-cookbooks/yum.svg)](https://travis-ci.org/opscode-cookbooks/yum)
+
 The Yum cookbook exposes the `yum_globalconfig` and `yum_repository`
 resources that allows a user to both control global behavior and make
 individual Yum repositories available for use. These resources aim to
@@ -60,6 +63,7 @@ end
 #### Actions
 - `:create` - creates a repository file and builds the repository listing
 - `:delete` - deletes the repository file
+- `:makecache` - update yum cache
 
 #### Parameters
 * `baseurl` -  Must be a URL to the directory where the yum repository's
@@ -98,6 +102,8 @@ end
   an empty list.
 * `keepalive` - Either `true` or `false`. This tells yum whether or not
   HTTP/1.1 keepalive should be used with this repository.  
+* `make_cache` - Optional, Default is `true`, if `false` then `yum -q makecache` will not
+  be ran
 * `max_retries` - Set the number of times any attempt to retrieve a file
   should retry before returning an error. Setting this to '0' makes
   yum try forever. Default is '10'.
@@ -126,6 +132,10 @@ end
   find that yum is not downloading the mirrorlists as often as you
   would like lower the value of this option.
 * `mirrorlist_expire` - alias for mirror_expire
+* `mode` - Permissions mode of .repo file on disk. Useful for
+  scenarios where secrets are in the repo file. If set to '600',
+  normal users will not be able to use yum search, yum info, etc.
+  Defaults to '0644'  
 * `priority` - When the yum-priorities plug-in is enabled, you set
   priorities on repository entries, where N is an integer from 1 to 99. The
   default priority for repositories is 99.
@@ -178,7 +188,7 @@ http://linux.die.net/man/5/yum.conf
   files. The default is '/var/cache/yum'.  
 * `keepcache` - Either `true` or `false`. Determines whether or not
   yum keeps the cache of headers and packages after successful
-  installation. Default is `true` (keep files)
+  installation. Default is `false`
 * `debuglevel` - Debug message output level. Practical range is 0-10.
   Default is '2'.  
 * `exclude` - List of packages to exclude from updates or installs.

data/cookbooks/yum/attributes/main.rb

@@ -73,7 +73,6 @@ default['yum']['main']['protected_packages'] = nil # /.*/
 default['yum']['main']['proxy'] = nil #  /.*/
 default['yum']['main']['proxy_password'] = nil #  /.*/
 default['yum']['main']['proxy_username'] = nil #  /.*/
-default['yum']['main']['username'] = nil #  /.*/
 default['yum']['main']['password'] = nil #  /.*/
 default['yum']['main']['recent'] = nil # /^\d+$/
 default['yum']['main']['releasever'] = nil #  /.*/

data/cookbooks/yum/metadata.json

@@ -1,8 +1,8 @@
 {
   "name": "yum",
-  "version": "3.2.2",
+  "version": "3.5.1",
   "description": "Configures various yum components on Red Hat-like systems",
-  "long_description": "yum Cookbook\n============\n\nThe Yum cookbook exposes the `yum_globalconfig` and `yum_repository`\nresources that allows a user to both control global behavior and make\nindividual Yum repositories available for use. These resources aim to\nallow the user to configure all options listed in the `yum.conf` man\npage, found at http://linux.die.net/man/5/yum.conf\n\nNOTES\n-----\nWARNING: Yum cookbook version 3.0.0 and above contain non-backwards\ncompatible breaking changes and will not work with cookbooks written\nagainst the 2.x and 1.x series. Changes have been made to the\nyum_repository resource, and the yum_key resource has been eliminated\nentirely. Recipes have been eliminated and moved into their own\ncookbooks. Please lock yum to the 2.x series in your Chef environments\nuntil all dependent cookbooks have been ported.\n\nRequirements\n------------\n* Chef 11 or higher\n* Ruby 1.9 (preferably from the Chef full-stack installer)\n* RHEL5, RHEL6, or other platforms within the family\n\nResources/Providers\n-------------------\n### yum_repository\nThis resource manages a yum repository configuration file at\n/etc/yum.repos.d/`repositoryid`.repo. When the file needs to be\nrepaired, it calls yum-makecache so packages in the repo become\navailable to the next resource.\n\n#### Example\n``` ruby\n# add the Zenoss repository\nyum_repository 'zenoss' do\n  description \"Zenoss Stable repo\"\n  baseurl \"http://dev.zenoss.com/yum/stable/\"\n  gpgkey 'http://dev.zenoss.com/yum/RPM-GPG-KEY-zenoss'\n  action :create\nend\n\n# add the EPEL repo\nyum_repository 'epel' do\n  description 'Extra Packages for Enterprise Linux'\n  mirrorlist 'http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=$basearch'\n  gpgkey 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'\n  action :create\nend\n```\n\n``` ruby\n# delete CentOS-Media repo\nyum_repository 'CentOS-Media' do\n  action :delete\nend\n```\n\n#### Actions\n- `:create` - creates a repository file and builds the repository listing\n- `:delete` - deletes the repository file\n\n#### Parameters\n* `baseurl` -  Must be a URL to the directory where the yum repository's\n  'repodata' directory lives. Can be an http://, ftp:// or file://\n  URL. You can specify multiple URLs in one baseurl statement.\n* `cost` - relative cost of accessing this repository. Useful for\n  weighing one repo's packages as greater/less than any other.\n  defaults to 1000\n* `description` - Maps to the 'name' parameter in a repository .conf.\n  Descriptive name for the repository channel. This directive must be\n  specified.\n* `enabled` - Either `true` or `false`. This tells yum whether or not use this repository.\n* `enablegroups` -  Either `true` or `false`. Determines whether yum\n  will allow the use of package groups for this repository. Default is\n  `true` (package groups are allowed).\n* `exclude` - List of packages to exclude from updates or installs. This\n  should be a space separated list in a single string. Shell globs using wildcards (eg. *\n  and ?) are allowed.\n* `failovermethod` - Either 'roundrobin' or 'priority'.\n* `fastestmirror_enabled` - Either `true` or `false`\n* `gpgcheck` - Either `true` or `false`. This tells yum whether or not\n  it should perform a GPG signature check on packages. When this is\n  set in the [main] section it sets the default for all repositories.\n  The default is `true`.\n* `gpgkey` - A URL pointing to the ASCII-armored GPG key file for the\n  repository. This option is used if yum needs a public key to verify\n  a package and the required key hasn't been imported into the RPM\n  database. If this option is set, yum will automatically import the\n  key from the specified URL.\n* `http_caching` - Either 'all', 'packages', or 'none'. Determines how\n  upstream HTTP caches are instructed to handle any HTTP downloads\n  that Yum does. Defaults to 'all'\n* `includepkgs` -  Inverse of exclude. This is a list of packages you\n  want to use from a repository. If this option lists only one package\n  then that is all yum will ever see from the repository. Defaults to\n  an empty list.\n* `keepalive` - Either `true` or `false`. This tells yum whether or not\n  HTTP/1.1 keepalive should be used with this repository.  \n* `max_retries` - Set the number of times any attempt to retrieve a file\n  should retry before returning an error. Setting this to '0' makes\n  yum try forever. Default is '10'.\n* `metadata_expire` - Time (in seconds) after which the metadata will\n  expire. So that if the current metadata downloaded is less than this\n  many seconds old then yum will not update the metadata against the\n  repository. If you find that yum is not downloading information on\n  updates as often as you would like lower the value of this option.\n  You can also change from the default of using seconds to using days,\n  hours or minutes by appending a d, h or m respectively. The default\n  is 6 hours, to compliment yum-updatesd running once an hour. It's\n  also possible to use the word \"never\", meaning that the metadata\n  will never expire. Note that when using a metalink file the metalink\n  must always be newer than the metadata for the repository, due to\n  the validation, so this timeout also applies to the metalink file.\n* `mirrorlist` - Specifies a URL to a file containing a list of\n  baseurls. This can be used instead of or with the baseurl option.\n  Substitution variables, described below, can be used with this\n  option. As a special hack is the mirrorlist URL contains the word\n  \"metalink\" then the value of mirrorlist is copied to metalink (if\n  metalink is not set)\n* `mirror_expire` - Time (in seconds) after which the mirrorlist locally\n  cached will expire. If the current mirrorlist is less than this many\n  seconds old then yum will not download another copy of the\n  mirrorlist, it has the same extra format as metadata_expire. If you\n  find that yum is not downloading the mirrorlists as often as you\n  would like lower the value of this option.\n* `mirrorlist_expire` - alias for mirror_expire\n* `priority` - When the yum-priorities plug-in is enabled, you set\n  priorities on repository entries, where N is an integer from 1 to 99. The\n  default priority for repositories is 99.\n* `proxy` - URL to the proxy server that yum should use.\n* `proxy_username` -  username to use for proxy\n* `proxy_password` - password for this proxy\n* `report_instanceid` - Report instance ID when using Amazon Linux AMIs\n  and repositories\n* `repositoryid` - Must be a unique name for each repository, one word.\n  Defaults to name attribute.\n* `source` - Use a custom template source instead of the default one\n  in the yum cookbook\n* `sslcacert` - Path to the directory containing the databases of the\n  certificate authorities yum should use to verify SSL certificates.\n  Defaults to none - uses system default\n* `sslclientcert` - Path to the SSL client certificate yum should use to\n  connect to repos/remote sites Defaults to none.  \n* `sslclientkey` - Path to the SSL client key yum should use to connect\n  to repos/remote sites Defaults to none.\n* `sslverify` - Either `true` or `false`. Determines if yum will verify SSL certificates/hosts. Defaults to `true`\n* `timeout` - Number of seconds to wait for a connection before timing\n  out. Defaults to 30 seconds. This may be too short of a time for\n  extremely overloaded sites.\n\n### yum_globalconfig\nThis renders a template with global yum configuration parameters. The\ndefault recipe uses it to render `/etc/yum.conf`. It is flexible\nenough to be used in other scenarios, such as building RPMs in\nisolation by modifying `installroot`. \n\n#### Example\n``` ruby\nyum_globalconfig '/my/chroot/etc/yum.conf' do\n  cachedir '/my/chroot/etc/yum.conf'\n  keepcache 'yes'\n  debuglevel '2'\n  installroot '/my/chroot'\n  action :create\nend\n```\n\n#### Parameters\n`yum_globalconfig` can take most of the same parameters as a\n`yum_repository`, plus more, too numerous to describe here. Below are\na few of the more commonly used ones. For a complete list, please\nconsult the `yum.conf` man page, found here:\nhttp://linux.die.net/man/5/yum.conf\n\n* `cachedir` - Directory where yum should store its cache and db\n  files. The default is '/var/cache/yum'.  \n* `keepcache` - Either `true` or `false`. Determines whether or not\n  yum keeps the cache of headers and packages after successful\n  installation. Default is `true` (keep files)\n* `debuglevel` - Debug message output level. Practical range is 0-10.\n  Default is '2'.  \n* `exclude` - List of packages to exclude from updates or installs.\n  This should be a space separated list. Shell globs using wildcards\n  (eg. * and ?) are allowed.  \n* `installonlypkgs` = List of package provides that should only ever\n  be installed, never updated. Kernels in particular fall into this\n  category. Defaults to kernel, kernel-bigmem, kernel-enterprise,\n  kernel-smp, kernel-debug, kernel-unsupported, kernel-source,\n  kernel-devel, kernel-PAE, kernel-PAE-debug.\n* `logfile` - Full directory and file name for where yum should write\n  its log file.\n* `exactarch` -  Either `true` or `false`. Set to `true` to make 'yum update' only\n  update the architectures of packages that you have installed. ie:\n  with this enabled yum will not install an i686 package to update an\n  x86_64 package. Default is `true`\n* `gpgcheck` - Either `true` or `false`. This tells yum whether or not\n  it should perform a GPG signature check on the packages gotten from\n  this repository.\n \nRecipes\n-------\n* `default` - Configures `yum_globalconfig[/etc/yum.conf]` with values\n  found in node attributes at `node['yum']['main']`\n\nAttributes\n----------\nThe following attributes are set by default\n\n``` ruby\ndefault['yum']['main']['cachedir'] = '/var/cache/yum/$basearch/$releasever'\ndefault['yum']['main']['keepcache'] = false\ndefault['yum']['main']['debuglevel'] = nil\ndefault['yum']['main']['exclude'] = nil\ndefault['yum']['main']['logfile'] = '/var/log/yum.log'\ndefault['yum']['main']['exactarch'] = nil\ndefault['yum']['main']['obsoletes'] = nil\ndefault['yum']['main']['installonly_limit'] = nil\ndefault['yum']['main']['installonlypkgs'] = nil\ndefault['yum']['main']['installroot'] = nil\n```\n\nRelated Cookbooks\n-----------------\nRecipes from older versions of this cookbook have been moved\nindividual cookbooks. Recipes for managing platform yum configurations\nand installing specific repositories can be found in one (or more!) of\nthe following cookbook.\n\n* yum-centos\n* yum-fedora\n* yum-amazon\n* yum-epel\n* yum-elrepo\n* yum-repoforge\n* yum-ius\n* yum-percona\n* yum-pgdg\n\nUsage\n-----\nPut `depends 'yum'` in your metadata.rb to gain access to the\nyum_repository resource.\n\nLicense & Authors\n-----------------\n- Author:: Eric G. Wolfe\n- Author:: Matt Ray (<matt@getchef.com>)\n- Author:: Joshua Timberman (<joshua@getchef.com>)\n- Author:: Sean OMeara (<someara@getchef.com>)\n\n```text\nCopyright:: 2011 Eric G. Wolfe\nCopyright:: 2013 Chef\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\n    http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n```\n",
+  "long_description": "",
   "maintainer": "Chef",
   "maintainer_email": "cookbooks@getchef.com",
   "license": "Apache 2.0",

data/cookbooks/yum/metadata.rb

@@ -3,8 +3,7 @@ maintainer 'Chef'
 maintainer_email 'cookbooks@getchef.com'
 license 'Apache 2.0'
 description 'Configures various yum components on Red Hat-like systems'
-long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '3.2.2'
+version '3.5.1'
 
 supports 'redhat'
 supports 'centos'

data/cookbooks/yum/providers/repository.rb

@@ -43,16 +43,19 @@ action :create  do
     else
       source new_resource.source
     end
-    mode '0644'
+    mode new_resource.mode
     variables(:config => new_resource)
-    notifies :run, "execute[yum-makecache-#{new_resource.repositoryid}]", :immediately
-    notifies :create, "ruby_block[yum-cache-reload-#{new_resource.repositoryid}]", :immediately
+    if new_resource.make_cache
+      notifies :run, "execute[yum-makecache-#{new_resource.repositoryid}]", :immediately
+      notifies :create, "ruby_block[yum-cache-reload-#{new_resource.repositoryid}]", :immediately
+    end
   end
 
   # get the metadata for this repo only
   execute "yum-makecache-#{new_resource.repositoryid}" do
     command "yum -q makecache --disablerepo=* --enablerepo=#{new_resource.repositoryid}"
     action :nothing
+    only_if { new_resource.enabled }
   end
 
   # reload internal Chef yum cache
@@ -81,5 +84,17 @@ action :delete do
   end
 end
 
+action :makecache do
+  execute "yum-makecache-#{new_resource.repositoryid}" do
+    command "yum -q makecache --disablerepo=* --enablerepo=#{new_resource.repositoryid}"
+    action :run
+  end
+
+  ruby_block "yum-cache-reload-#{new_resource.repositoryid}" do
+    block { Chef::Provider::Package::Yum::YumCache.instance.reload }
+    action :run
+  end
+end
+
 alias_method :action_add, :action_create
 alias_method :action_remove, :action_delete

data/cookbooks/yum/recipes/default.rb

@@ -1,8 +1,9 @@
 #
 # Author:: Sean OMeara (<someara@getchef.com>)
+# Author:: Joshua Timberman (<joshua@getchef.com>)
 # Recipe:: yum::default
 #
-# Copyright 2013, Chef
+# Copyright 2013-2014, Chef Software, Inc (<legal@getchef.com>)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,18 +18,9 @@
 # limitations under the License.
 
 yum_globalconfig '/etc/yum.conf' do
-  cachedir node['yum']['main']['cachedir']
-  keepcache node['yum']['main']['keepcache']
-  debuglevel node['yum']['main']['debuglevel']
-  exclude node['yum']['main']['exclude']
-  logfile node['yum']['main']['logfile']
-  exactarch node['yum']['main']['exactarch']
-  obsoletes node['yum']['main']['obsoletes']
-  proxy node['yum']['main']['proxy']
-  installonly_limit node['yum']['main']['installonly_limit']
-  installonlypkgs node['yum']['main']['installonlypkgs']
-  installroot node['yum']['main']['installroot']
-  distroverpkg node['yum']['main']['distroverpkg']
-  releasever node['yum']['main']['releasever']
+  node['yum']['main'].each do |config, value|
+    send(config.to_sym, value)
+  end
+
   action :create
 end

data/cookbooks/yum/resources/globalconfig.rb

@@ -56,7 +56,7 @@ attribute :groupremove_leaf_only, :kind_of => [TrueClass, FalseClass], :default
 attribute :history_list_view, :kind_of => String, :equal_to => %w(users commands single-user-commands), :default => nil
 attribute :history_record, :kind_of => [TrueClass, FalseClass], :default => nil
 attribute :history_record_packages, :kind_of => String, :regex => /.*/, :default => nil
-attribute :http_caching, :kind_of => [TrueClass, FalseClass], :default => nil
+attribute :http_caching, :kind_of => String, :equal_to => %w(packages all none), :default => nil
 attribute :installonly_limit, :kind_of => String, :regex => [/^\d+/, /keep/], :default => '3'
 attribute :installonlypkgs, :kind_of => String, :regex => /.*/, :default => nil
 attribute :installroot, :kind_of => String, :regex => /.*/, :default => nil
@@ -70,7 +70,7 @@ attribute :mdpolicy, :kind_of => String, :equal_to => %w(instant group:primary g
 attribute :metadata_expire, :kind_of => String, :regex => [/^\d+$/, /^\d+[mhd]$/, /never/], :default => nil
 attribute :mirrorlist_expire, :kind_of => String, :regex => /^\d+$/, :default => nil
 attribute :multilib_policy, :kind_of => String, :equal_to => %w(all best), :default => nil
-attribute :obsoletes, :kind_of => [TrueClass, FalseClass], :default => true
+attribute :obsoletes, :kind_of => [TrueClass, FalseClass], :default => nil
 attribute :overwrite_groups, :kind_of => [TrueClass, FalseClass], :default => nil
 attribute :password, :kind_of => String, :regex => /.*/, :default => nil
 attribute :path, :kind_of => String, :regex => /.*/, :default => nil, :name_attribute => true
@@ -86,6 +86,7 @@ attribute :proxy_username, :kind_of => String, :regex => /.*/, :default => nil
 attribute :recent, :kind_of => String, :regex => /^\d+$/, :default => nil
 attribute :releasever, :kind_of => String, :regex => /.*/, :default => nil
 attribute :repo_gpgcheck, :kind_of => [TrueClass, FalseClass], :default => nil
+attribute :reposdir, :kind_of => String, :regex => /.*/, :default => nil
 attribute :reset_nice, :kind_of => [TrueClass, FalseClass], :default => nil
 attribute :rpmverbosity, :kind_of => String, :equal_to => %w(info critical emergency error warn debug), :default => nil
 attribute :showdupesfromrepos, :kind_of => [TrueClass, FalseClass], :default => nil
@@ -103,3 +104,5 @@ attribute :timeout, :kind_of => String, :regex => /^\d+$/, :default => nil
 attribute :tolerant, :kind_of => [TrueClass, FalseClass], :default => nil
 attribute :tsflags, :kind_of => String, :regex => /.*/, :default => nil
 attribute :username, :kind_of => String, :regex => /.*/, :default => nil
+
+attribute :options, :kind_of => Hash

data/cookbooks/yum/resources/repository.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-actions :create, :delete, :add, :remove
+actions :create, :delete, :add, :remove, :makecache
 
 default_action :create
 
@@ -37,12 +37,14 @@ attribute :http_caching, :kind_of => String, :equal_to => %w(packages all none),
 attribute :include_config, :kind_of => String, :regex => /.*/, :default => nil
 attribute :includepkgs, :kind_of => String, :regex => /.*/, :default => nil
 attribute :keepalive, :kind_of => [TrueClass, FalseClass], :default => nil
+attribute :make_cache, :kind_of => [TrueClass, FalseClass], :default => true
 attribute :max_retries, :kind_of => String, :regex => /.*/, :default => nil
 attribute :metadata_expire, :kind_of => String, :regex => [/^\d+$/, /^\d+[mhd]$/, /never/], :default => nil
 attribute :mirrorexpire, :kind_of => String, :regex => /.*/, :default => nil
 attribute :mirrorlist, :kind_of => String, :regex => /.*/, :default => nil
-attribute :mirror_expire, :kind_of => String, :regex => /^\d+$/, :default => nil
-attribute :mirrorlist_expire, :kind_of => String, :regex => /^\d+$/, :default => nil
+attribute :mirror_expire, :kind_of => String, :regex => [/^\d+$/, /^\d+[mhd]$/], :default => nil
+attribute :mirrorlist_expire, :kind_of => String, :regex => [/^\d+$/, /^\d+[mhd]$/], :default => nil
+attribute :mode, :default => '0644'
 attribute :priority, :kind_of => String, :regex => /^(\d?[0-9]|[0-9][0-9])$/, :default => nil
 attribute :proxy, :kind_of => String, :regex => /.*/, :default => nil
 attribute :proxy_username, :kind_of => String, :regex => /.*/, :default => nil
@@ -59,5 +61,7 @@ attribute :sslclientkey, :kind_of => String, :regex => /.*/, :default => nil
 attribute :sslverify, :kind_of => [TrueClass, FalseClass], :default => true
 attribute :timeout, :kind_of => String, :regex => /^\d+$/, :default => nil
 
+attribute :options, :kind_of => Hash
+
 alias_method :url, :baseurl
 alias_method :keyurl, :gpgkey