Skip to content

Commit

Permalink
Merge pull request #23 from petegallagher/master
Browse files Browse the repository at this point in the history
Make yum-epel recipe optional
  • Loading branch information
tas50 committed Feb 20, 2015
2 parents e0accd3 + e65759e commit 7150aae
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Attributes

### options for package install
* `node['nrpe']['package']['options']` - options when installing nrpe via package manager. The default value for this attribute is nil.`
* `node['nrpe']['install_yum-epel']` - whether to install the EPEL repo or not. The default value is `true`. Set this to `false` if you do not wish to install the EPEL RPM; in this scenario you will need to make the relevant NRPE packages available via another method e.g. local repo.

### nrpe.conf attributes
* `node['nrpe']['server_port']` - the port nrpe will listen on, default 5666
Expand Down
1 change: 1 addition & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
default['nrpe']['check_action'] = 'restart'
end
default['nrpe']['install_method'] = 'package'
default['nrpe']['install_yum-epel'] = true
default['nrpe']['pid_file'] = '/var/run/nrpe.pid'
default['nrpe']['packages'] = %w(nrpe nagios-plugins-disk nagios-plugins-load nagios-plugins-procs nagios-plugins-users)
if node['kernel']['machine'] == 'i686'
Expand Down
2 changes: 1 addition & 1 deletion recipes/_package_install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# nrpe packages are available in EPEL on rhel / fedora platforms
# fedora 17 and later don't require epel
if platform_family?('rhel', 'fedora')
if platform_family?('rhel', 'fedora') && node['nrpe']['install_yum-epel']
unless platform?('fedora') && node['platform_version'].to_i > 16
include_recipe 'yum-epel'
end
Expand Down

0 comments on commit 7150aae

Please sign in to comment.