summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2014-06-21 23:35:09 -0500
committerAustin Seipp <aseipp@pobox.com>2014-06-22 00:22:10 -0500
commit6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4 (patch)
treea066633acd2d550014bae61cf146b5aff1ddaa12 /pkgs/top-level
parentb8ede68b25af12acf88560d4bf31452390ff69b8 (diff)
downloadnixlib-6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4.tar
nixlib-6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4.tar.gz
nixlib-6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4.tar.bz2
nixlib-6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4.tar.lz
nixlib-6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4.tar.xz
nixlib-6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4.tar.zst
nixlib-6cfa38ce7d5bae41e32f50c82efafa98c3ba34f4.zip
nagios: significant upgrades
 - Upgrade Nagios Core to 4.x
 - Expose mainConfigFile and cgiConfigFile in module for finer
   configuration control.
 - Upgrade Plugins to 2.x
 - Remove default objectDefs, which users probably want to customize.
 - Systemd-ify Nagios module and simplify directory structure
 - Upgrade Nagios package with more modern patch, and ensure the
   statedir is set to /var/lib/nagios

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7ade25cbf4b..d1619cf52ece 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6756,13 +6756,11 @@ let
 
   mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
 
-  nagios = callPackage ../servers/monitoring/nagios {
-    gdSupport = true;
-  };
+  nagios = callPackage ../servers/monitoring/nagios { };
 
   munin = callPackage ../servers/monitoring/munin { };
 
-  nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official { };
+  nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { };
 
   net_snmp = callPackage ../servers/monitoring/net-snmp { };