summary refs log tree commit diff
path: root/nixos/modules/services/monitoring
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2015-09-04 21:46:10 +0200
committerRickard Nilsson <rickynils@gmail.com>2015-09-04 21:46:10 +0200
commited140ff9272885b62dc896ae36e80c251b49917a (patch)
treecc7c7986bd5fc57eb2930cadb8593186e2e7c9ce /nixos/modules/services/monitoring
parent3163d1aa6546bbc60019bed913aeee040481f9da (diff)
downloadnixlib-ed140ff9272885b62dc896ae36e80c251b49917a.tar
nixlib-ed140ff9272885b62dc896ae36e80c251b49917a.tar.gz
nixlib-ed140ff9272885b62dc896ae36e80c251b49917a.tar.bz2
nixlib-ed140ff9272885b62dc896ae36e80c251b49917a.tar.lz
nixlib-ed140ff9272885b62dc896ae36e80c251b49917a.tar.xz
nixlib-ed140ff9272885b62dc896ae36e80c251b49917a.tar.zst
nixlib-ed140ff9272885b62dc896ae36e80c251b49917a.zip
bosun,scollector: Fix NixOS modules to use bin attr of go pkgs
Diffstat (limited to 'nixos/modules/services/monitoring')
-rw-r--r--nixos/modules/services/monitoring/bosun.nix5
-rw-r--r--nixos/modules/services/monitoring/scollector.nix4
2 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 7a53ce174542..50f621ef307e 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -30,7 +30,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        example = literalExample "pkgs.bosun";
+        default = pkgs.bosun.bin;
+        example = literalExample "pkgs.bosun.bin";
         description = ''
           bosun binary to use.
         '';
@@ -95,8 +96,6 @@ in {
 
   config = mkIf cfg.enable {
   
-    services.bosun.package = mkDefault pkgs.bosun; 
-
     systemd.services.bosun = {
       description = "bosun metrics collector (part of Bosun)";
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 8b97daf8881a..cac0a809c963 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -42,8 +42,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.scollector;
-        example = literalExample "pkgs.scollector";
+        default = pkgs.scollector.bin;
+        example = literalExample "pkgs.scollector.bin";
         description = ''
           scollector binary to use.
         '';