Skip to content

Bugfix for Ubuntu & reload over restart for faster config updates #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bitgangsta wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bugfix for Ubuntu & reload over restart for faster config updates #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40632a3
changed restart -> reload, for smoother config updates
hdanak Jun 22, 2013
6a6afc8
Changed interpreter for ubuntu init script to bash.
hdanak Jul 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions definitions/monitrc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
end
2 changes: 1 addition & 1 deletion files/default/init-monit-ubuntu12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

### BEGIN INIT INFO
# Provides: monit
Expand Down
6 changes: 3 additions & 3 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,5 +28,5 @@
group "root"
mode 0700
source 'monitrc.erb'
notifies :restart, resources(:service => "monit"), :delayed
notifies :reload, resources(:service => "monit"), :delayed
end