Skip to content

Commit

Permalink
Add support for Ubuntu 20.04
Browse files Browse the repository at this point in the history
Since Ubuntu 16.04 the plugins package is `monitoring-plugins-basic` but
a metapackage named `nagios-plugins-basic` (which install the former) is
maintained. In Ubuntu 20.04 this metapackage does not exist, so it
is appropriately updated.
  • Loading branch information
amateo committed Jun 30, 2020
1 parent da668dc commit a922f10
Show file tree
Hide file tree
Showing 4 changed files with 845 additions and 214 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ It is tested on the following platforms.
* Solaris 10
* Solaris 11
* Ubuntu 12
* Ubuntu 14.04
* Ubuntu 16.04
* Ubuntu 18.04
* Ubuntu 20.04

===

Expand Down
5 changes: 4 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@
$default_nrpe_package = 'nagios-nrpe-server'
$default_nrpe_package_adminfile = undef
$default_nrpe_package_source = undef
$default_nagios_plugins_package = 'nagios-plugins-basic'
$default_nagios_plugins_package = (versioncmp($facts[os][release][full], '20.04') < 0) ? {
true => 'nagios-plugins-basic',
default => 'monitoring-plugins-basic',
}
$default_nagios_plugins_package_adminfile = undef
$default_nagios_plugins_package_source = undef
$default_nrpe_config = '/etc/nagios/nrpe.cfg'
Expand Down
6 changes: 5 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"12.04"
"12.04",
"14.04",
"16.04",
"18.04",
"20.04"
]
}
]
Expand Down
Loading

0 comments on commit a922f10

Please sign in to comment.