Update cookbooks and add wordpress cookbook

cookbooks/runit/libraries/resource_runit_service.rb

@@ -29,8 +29,8 @@ class Chef
         super
         runit_node = runit_attributes_from_node(run_context)
         @resource_name = :runit_service
-        @provider = Chef::Provider::Service::Runit
-        @supports = { :restart => true, :reload => true, :status => true }
+        @provider = Chef::Provider::RunitService
+        @supports = { restart: true, reload: true, status: true }
         @action = :enable
         @allowed_actions = [:nothing, :start, :stop, :enable, :disable, :restart, :reload, :status, :once, :hup, :cont, :term, :kill, :up, :down, :usr1, :usr2, :create]
 
@@ -47,6 +47,8 @@ class Chef
         @log = true
         @cookbook = nil
         @check = false
+        @start_down = false
+        @delete_downfile = false
         @finish = false
         @owner = nil
         @group = nil
@@ -63,6 +65,7 @@ class Chef
         @sv_templates = true
         @sv_timeout = nil
         @sv_verbose = false
+        @log_dir = ::File.join('/var/log/', @service_name)
         @log_size = nil
         @log_num = nil
         @log_min = nil
@@ -94,103 +97,114 @@ class Chef
       end
 
       def sv_bin(arg = nil)
-        set_or_return(:sv_bin, arg, :kind_of => [String])
+        set_or_return(:sv_bin, arg, kind_of: [String])
       end
 
       def sv_dir(arg = nil)
-        set_or_return(:sv_dir, arg, :kind_of => [String, FalseClass])
+        set_or_return(:sv_dir, arg, kind_of: [String, FalseClass])
       end
 
       def sv_timeout(arg = nil)
-        set_or_return(:sv_timeout, arg, :kind_of => [Fixnum])
+        set_or_return(:sv_timeout, arg, kind_of: [Fixnum])
       end
 
       def sv_verbose(arg = nil)
-        set_or_return(:sv_verbose, arg, :kind_of => [TrueClass, FalseClass])
+        set_or_return(:sv_verbose, arg, kind_of: [TrueClass, FalseClass])
       end
 
       def service_dir(arg = nil)
-        set_or_return(:service_dir, arg, :kind_of => [String])
+        set_or_return(:service_dir, arg, kind_of: [String])
       end
 
       def lsb_init_dir(arg = nil)
-        set_or_return(:lsb_init_dir, arg, :kind_of => [String])
+        set_or_return(:lsb_init_dir, arg, kind_of: [String])
       end
 
       def control(arg = nil)
-        set_or_return(:control, arg, :kind_of => [Array])
+        set_or_return(:control, arg, kind_of: [Array])
       end
 
       def options(arg = nil)
-        @env.empty? ? opts = @options : opts = @options.merge!(:env_dir => ::File.join(@sv_dir, @service_name, 'env'))
+        default_opts = @env.empty? ? @options : @options.merge(env_dir: ::File.join(@sv_dir, @service_name, 'env'))
+
+        merged_opts = arg.respond_to?(:merge) ? default_opts.merge(arg) : default_opts
+
         set_or_return(
           :options,
-          arg,
-          :kind_of => [Hash],
-          :default => opts
+          merged_opts,
+          kind_of: [Hash],
+          default: default_opts
         )
       end
 
       def env(arg = nil)
-        set_or_return(:env, arg, :kind_of => [Hash])
+        set_or_return(:env, arg, kind_of: [Hash])
       end
 
       ## set log to current instance value if nothing is passed.
       def log(arg = @log)
-        set_or_return(:log, arg, :kind_of => [TrueClass, FalseClass])
+        set_or_return(:log, arg, kind_of: [TrueClass, FalseClass])
       end
 
       def cookbook(arg = nil)
-        set_or_return(:cookbook, arg, :kind_of => [String])
+        set_or_return(:cookbook, arg, kind_of: [String])
       end
 
       def finish(arg = nil)
-        set_or_return(:finish, arg, :kind_of => [TrueClass, FalseClass])
+        set_or_return(:finish, arg, kind_of: [TrueClass, FalseClass])
       end
 
       def check(arg = nil)
-        set_or_return(:check, arg, :kind_of => [TrueClass, FalseClass])
+        set_or_return(:check, arg, kind_of: [TrueClass, FalseClass])
+      end
+
+      def start_down(arg = nil)
+        set_or_return(:start_down, arg, kind_of: [TrueClass, FalseClass])
+      end
+
+      def delete_downfile(arg = nil)
+        set_or_return(:delete_downfile, arg, kind_of: [TrueClass, FalseClass])
       end
 
       def owner(arg = nil)
-        set_or_return(:owner, arg, :regex => [Chef::Config[:user_valid_regex]])
+        set_or_return(:owner, arg, regex: [Chef::Config[:user_valid_regex]])
       end
 
       def group(arg = nil)
-        set_or_return(:group, arg, :regex => [Chef::Config[:group_valid_regex]])
+        set_or_return(:group, arg, regex: [Chef::Config[:group_valid_regex]])
       end
 
       def default_logger(arg = nil)
-        set_or_return(:default_logger, arg, :kind_of => [TrueClass, FalseClass])
+        set_or_return(:default_logger, arg, kind_of: [TrueClass, FalseClass])
       end
 
       def restart_on_update(arg = nil)
-        set_or_return(:restart_on_update, arg, :kind_of => [TrueClass, FalseClass])
+        set_or_return(:restart_on_update, arg, kind_of: [TrueClass, FalseClass])
       end
 
       def run_template_name(arg = nil)
-        set_or_return(:run_template_name, arg, :kind_of => [String])
+        set_or_return(:run_template_name, arg, kind_of: [String])
       end
       alias_method :template_name, :run_template_name
 
       def log_template_name(arg = nil)
-        set_or_return(:log_template_name, arg, :kind_of => [String])
+        set_or_return(:log_template_name, arg, kind_of: [String])
       end
 
       def check_script_template_name(arg = nil)
-        set_or_return(:check_script_template_name, arg, :kind_of => [String])
+        set_or_return(:check_script_template_name, arg, kind_of: [String])
       end
 
       def finish_script_template_name(arg = nil)
-        set_or_return(:finish_script_template_name, arg, :kind_of => [String])
+        set_or_return(:finish_script_template_name, arg, kind_of: [String])
       end
 
       def control_template_names(arg = nil)
         set_or_return(
           :control_template_names,
           arg,
-          :kind_of => [Hash],
-          :default => set_control_template_names
+          kind_of: [Hash],
+          default: set_control_template_names
         )
       end
 
@@ -202,39 +216,43 @@ class Chef
       end
 
       def sv_templates(arg = nil)
-        set_or_return(:sv_templates, arg, :kind_of => [TrueClass, FalseClass])
+        set_or_return(:sv_templates, arg, kind_of: [TrueClass, FalseClass])
+      end
+
+      def log_dir(arg = nil)
+        set_or_return(:log_dir, arg, kind_of: [String])
       end
 
       def log_size(arg = nil)
-        set_or_return(:log_size, arg, :kind_of => [Integer])
+        set_or_return(:log_size, arg, kind_of: [Integer])
       end
 
       def log_num(arg = nil)
-        set_or_return(:log_num, arg, :kind_of => [Integer])
+        set_or_return(:log_num, arg, kind_of: [Integer])
       end
 
       def log_min(arg = nil)
-        set_or_return(:log_min, arg, :kind_of => [Integer])
+        set_or_return(:log_min, arg, kind_of: [Integer])
       end
 
       def log_timeout(arg = nil)
-        set_or_return(:log_timeout, arg, :kind_of => [Integer])
+        set_or_return(:log_timeout, arg, kind_of: [Integer])
       end
 
       def log_processor(arg = nil)
-        set_or_return(:log_processor, arg, :kind_of => [String])
+        set_or_return(:log_processor, arg, kind_of: [String])
       end
 
       def log_socket(arg = nil)
-        set_or_return(:log_socket, arg, :kind_of => [String, Hash])
+        set_or_return(:log_socket, arg, kind_of: [String, Hash])
       end
 
       def log_prefix(arg = nil)
-        set_or_return(:log_prefix, arg, :kind_of => [String])
+        set_or_return(:log_prefix, arg, kind_of: [String])
       end
 
       def log_config_append(arg = nil)
-        set_or_return(:log_config_append, arg, :kind_of => [String])
+        set_or_return(:log_config_append, arg, kind_of: [String])
       end
 
       def runit_attributes_from_node(run_context)