From 40632a3cbed405ad25dc62475236d254e6950531 Mon Sep 17 00:00:00 2001 From: Hike Danakian Date: Fri, 21 Jun 2013 19:47:11 -0700 Subject: [PATCH 1/2] changed restart -> reload, for smoother config updates --- definitions/monitrc.rb | 6 +++--- recipes/default.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/definitions/monitrc.rb b/definitions/monitrc.rb index 85d9a18..2c9c7ea 100644 --- a/definitions/monitrc.rb +++ b/definitions/monitrc.rb @@ -13,13 +13,13 @@ source params[:template_source] cookbook params[:template_cookbook] variables params[:variables] - notifies :restart, resources(:service => "monit"), params[:reload] + notifies :reload, resources(:service => "monit"), params[:reload] action :create end else template "/etc/monit/conf.d/#{params[:name]}.conf" do action :delete - notifies :restart, resources(:service => "monit"), params[:reload] + notifies :reload, resources(:service => "monit"), params[:reload] end end -end \ No newline at end of file +end diff --git a/recipes/default.rb b/recipes/default.rb index 1a1a0d3..f4aafff 100755 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -10,9 +10,9 @@ end service "monit" do - action [:enable, :start] + action [:enable, :reload] enabled true - supports [:start, :restart, :stop] + supports [:start, :reload, :restart, :stop] end directory "/etc/monit/conf.d/" do @@ -28,5 +28,5 @@ group "root" mode 0700 source 'monitrc.erb' - notifies :restart, resources(:service => "monit"), :delayed + notifies :reload, resources(:service => "monit"), :delayed end From 6a6afc85d9c68bf1f62234ffbca5b77294b60def Mon Sep 17 00:00:00 2001 From: Hike Danakian Date: Mon, 8 Jul 2013 09:23:56 -0700 Subject: [PATCH 2/2] Changed interpreter for ubuntu init script to bash. --- files/default/init-monit-ubuntu12.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/default/init-monit-ubuntu12.sh b/files/default/init-monit-ubuntu12.sh index a922897..4c1ec93 100644 --- a/files/default/init-monit-ubuntu12.sh +++ b/files/default/init-monit-ubuntu12.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash ### BEGIN INIT INFO # Provides: monit