diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-02 12:59:14 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-02 12:59:14 +0100 |
| commit | 55cf272c195d0a9f5c6cdef60fd6171f42367d53 (patch) | |
| tree | 2473585d85fe1ce0284596aa9fa7a740f55f4e3d /nixos/modules | |
| parent | a0cf449fa58f0432cf01578c6104ed1eb21ebd29 (diff) | |
| download | nixlib-55cf272c195d0a9f5c6cdef60fd6171f42367d53.tar nixlib-55cf272c195d0a9f5c6cdef60fd6171f42367d53.tar.gz nixlib-55cf272c195d0a9f5c6cdef60fd6171f42367d53.tar.bz2 nixlib-55cf272c195d0a9f5c6cdef60fd6171f42367d53.tar.lz nixlib-55cf272c195d0a9f5c6cdef60fd6171f42367d53.tar.xz nixlib-55cf272c195d0a9f5c6cdef60fd6171f42367d53.tar.zst nixlib-55cf272c195d0a9f5c6cdef60fd6171f42367d53.zip | |
fixes #5198
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/monitoring/bosun.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/kubernetes.nix | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 067c826f4e42..7a53ce174542 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -30,7 +30,6 @@ in { package = mkOption { type = types.package; - default = pkgs.bosun; example = literalExample "pkgs.bosun"; description = '' bosun binary to use. @@ -94,8 +93,9 @@ in { }; - config = mkIf config.services.bosun.enable { - + config = mkIf cfg.enable { + + services.bosun.package = mkDefault pkgs.bosun; systemd.services.bosun = { description = "bosun metrics collector (part of Bosun)"; diff --git a/nixos/modules/virtualisation/kubernetes.nix b/nixos/modules/virtualisation/kubernetes.nix index 50388cf2e121..e01499822ad0 100644 --- a/nixos/modules/virtualisation/kubernetes.nix +++ b/nixos/modules/virtualisation/kubernetes.nix @@ -12,7 +12,6 @@ in { options.virtualisation.kubernetes = { package = mkOption { description = "Kubernetes package to use."; - default = pkgs.kubernetes; type = types.package; }; @@ -443,6 +442,8 @@ in { cfg.kubelet.enable || cfg.proxy.enable ) { + virtualisation.kubernetes.package = mkDefault pkgs.kubernetes; + environment.systemPackages = [ cfg.package ]; users.extraUsers = singleton { |