Permalink
Browse files

This one was a bug.

  • Loading branch information...
1 parent 5b62336 commit 6b2a2a3745f4061d0c493c6bbc2818e21b195f9d @benburkert committed Apr 6, 2009
Showing with 4 additions and 4 deletions.
  1. +1 −1 cookbooks/haproxy/attributes/haproxy.rb
  2. +3 −3 cookbooks/monit/recipes/default.rb
@@ -1,4 +1,4 @@
-haproxy Mash.new unless attribute?('haproxy')
+haproxy = Mash.new unless attribute?('haproxy')
haproxy[:user] = @attribute[:user]
haproxy[:password] = @attribute[:password]
@@ -3,23 +3,23 @@
# Recipe:: default
#
-execute "rm-mongrel_merb.#{node[:monit][:application]}.monitrc-file" do
+execute "rm-mongrel_merb.*.monitrc-file" do
command %Q{
rm /etc/monit.d/rm-mongrel_merb.#{node[:monit][:application]}.monitrc
}
not_if { not File.exists? "/etc/monit.d/rm-mongrel_merb.#{node[:monit][:application]}.monitrc"}
end
-template "/etc/monit.d/merb_mongrels.#{node[:monit][:application]}.monitrc" do
+template "/etc/monit.d/merb_mongrels.*.monitrc" do
owner 'root'
group 'root'
mode 0644
source "merb_mongrel.monitrc.erb"
variables(node[:monit])
end
-template "/etc/monit.d/merb_script.#{node[:monit][:application]}.monitrc" do
+template "/etc/monit.d/merb_script.*.monitrc" do
owner 'root'
group 'root'
mode 0644

0 comments on commit 6b2a2a3

Please sign in to comment.