Merge branch 'master' of github.com:escapestudios-cookbooks/beanstalkd

djoos-cookbooks · Feb 9, 2015 · fe69796 · fe69796
2 parents 65e335d + a664298
commit fe69796
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Berksfile b/Berksfile
@@ -1,3 +1,3 @@
 source 'https://supermarket.getchef.com'
 
-metadata
+metadata
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'MIT'
 description 'Installs/Configures beanstalkd'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.1.4'
+version '0.1.5'
 
 %w( debian ubuntu redhat centos fedora scientific amazon ).each do |os|
   supports os

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,3 +1,4 @@
+require 'rspec/expectations'
 require 'chefspec'
 require 'chefspec/berkshelf'
 

diff --git a/templates/ubuntu/beanstalkd.erb b/templates/ubuntu/beanstalkd.erb
@@ -7,7 +7,8 @@
 ## Defaults for the beanstalkd init script, /etc/init.d/beanstalkd on
 ## Debian systems. Append ``-b /var/lib/beanstalkd'' for persistent
 ## storage.
-DAEMON_OPTS="<% @opts.each do |k,v| %><%= "-#{k} #{v}" %> <% end %>"
+BEANSTALKD_EXTRA="<% @opts.each do |k,v| %><%= "-#{k} #{v}" %> <% end %>"
+DAEMON_OPTS=$BEANSTALKD_EXTRA
 
 ## Uncomment to enable startup during boot.
 <% unless @start_during_boot %>#<% end %>START=yes