Refactor

attributes/default.rb

@@ -5,7 +5,10 @@
 # Copyright 2012-2013, Escape Studios
 #
 
-default[:beanstalkd][:opts] = {}
+default["beanstalkd"]["opts"] = {}
 
 #Ubuntu only
-default[:beanstalkd][:start_during_boot] = false
+default["beanstalkd"]["start_during_boot"] = false
+
+default["beanstalkd"]["upgrade"] = true
+default["beanstalkd"]["repo"] = false

recipes/conf.rb

@@ -0,0 +1,26 @@
+case node["platform_family"]
+when "debian"
+ template "beanstalkd default file" do
+ source "beanstalkd.default.erb"
+ path "/etc/default/beanstalkd"
+ owner "root"
+ group "root"
+ mode 0640
+ variables(
+ :opts => node["beanstalkd"]["opts"],
+ :start_during_boot => node["beanstalkd"]["start_during_boot"]
+ )
+ end
+when "rhel"
+ template "beanstalkd sysconfig file" do
+ source "beanstalkd.sysconfig.erb"
+ path "/etc/sysconfig/beanstalkd"
+ owner "root"
+ group "root"
+ mode 0640
+ variables(
+ :opts => node["beanstalkd"]["opts"]
+ )
+ notifies :restart, "service[beanstalkd]"
+ end
+end

recipes/default.rb

@@ -5,34 +5,7 @@
 # Copyright 2012-2013, Escape Studios
 #
 
-package "beanstalkd" do
- action :upgrade
-end
-
-case node[:platform]
- when "debian", "ubuntu"
- template_path = "/etc/default/beanstalkd" #templates/ubuntu
- else
- template_path = "/etc/sysconfig/beanstalkd" #templates/default
-end
-
-template "#{template_path}" do
- source "beanstalkd.erb"
- owner "root"
- group "root"
- mode 0640
- variables(
- :opts => node[:beanstalkd][:opts],
- :start_during_boot => node[:beanstalkd][:start_during_boot]
- )
- notifies :restart, "service[beanstalkd]"
-end
-
-service "beanstalkd" do
- start_command "/etc/init.d/beanstalkd start"
- stop_command "/etc/init.d/beanstalkd stop"
- status_command "/etc/init.d/beanstalkd status"
- supports [:start, :stop, :status]
- #starts the service if it's not running and enables it to start at system boot time
- action [:enable, :start]
-end
+include_recipe "beanstalkd::repo" if node["beanstalkd"]["repo"]
+include_recipe "beanstalkd::install"
+include_recipe "beanstalkd::conf"
+include_recipe "beanstalkd::service"

recipes/install.rb

@@ -0,0 +1 @@
+include_recipe "beanstalkd::install_#{node["beanstalk"]["install_method"]}"

recipes/install_package.rb

@@ -0,0 +1,3 @@
+package "beanstalkd" do
+ action :upgrade if node["beanstalkd"]["upgrade"]
+end

recipes/repo.rb

@@ -0,0 +1,10 @@
+case node["platform"]
+when "ubuntu"
+ apt_repository "beanstalkd" do
+ uri "http://ppa.launchpad.net/jernej/beanstalkd/ubuntu"
+ distribution node['lsb']['codename']
+ components ["main"]
+ keyserver "keyserver.ubuntu.com"
+ key "422D2977"
+ end
+end

recipes/service.rb

@@ -0,0 +1,5 @@
+service "beanstalkd" do
+ supports :status => true
+ #starts the service if it's not running and enables it to start at system boot time
+ action [:enable, :start]
+end