Skip to content
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.

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

Adding option to manage the handlers dir #431

Merged
merged 2 commits into from
Oct 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
# Default: true
# Valid values: true, false
#
# [*manage_handlers_dir*]
# Boolean. Manage the sensu handlers directory
# Default: true
# Valid values: true, false
#
# [*rabbitmq_port*]
# Integer. Rabbitmq port to be used by sensu
# Default: 5672
Expand Down Expand Up @@ -280,6 +285,7 @@
$manage_services = true,
$manage_user = true,
$manage_plugins_dir = true,
$manage_handlers_dir = true,
$rabbitmq_port = 5672,
$rabbitmq_host = 'localhost',
$rabbitmq_user = 'sensu',
Expand Down
20 changes: 11 additions & 9 deletions manifests/package.pp
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,17 @@
require => Package['sensu'],
}

file { '/etc/sensu/handlers':
ensure => directory,
mode => '0555',
owner => 'sensu',
group => 'sensu',
purge => $sensu::_purge_handlers,
recurse => true,
force => true,
require => Package['sensu'],
if $sensu::manage_handlers_dir {
file { '/etc/sensu/handlers':
ensure => directory,
mode => '0555',
owner => 'sensu',
group => 'sensu',
purge => $sensu::_purge_handlers,
recurse => true,
force => true,
require => Package['sensu'],
}
}

file { ['/etc/sensu/extensions', '/etc/sensu/extensions/handlers']:
Expand Down
18 changes: 18 additions & 0 deletions spec/classes/sensu_package_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -208,4 +208,22 @@

end

context 'directories' do
context 'manage handlers directory' do
let(:params) { { :manage_handlers_dir => true } }
it { should contain_file('/etc/sensu/handlers').with(
:ensure => 'directory',
:mode => '0555',
:owner => 'sensu',
:group => 'sensu',
:recurse => true,
:force => true
) }
end

context 'do not manage handlers directory' do
let (:params) { { :manage_handlers_dir => false }}
it { should_not contain_file('/etc/sensu/handlers') }
end
end
end