alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fixes #5198

Browse source
This commit is contained in:
Domen Kožar 2014-12-02 12:59:14 +01:00
parent a0cf449fa5
commit 55cf272c19
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/monitoring/bosun.nix
View file

@ -30,7 +30,6 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.bosun;
example = literalExample "pkgs.bosun"; example = literalExample "pkgs.bosun";
description = '' description = ''
bosun binary to use. 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 = { systemd.services.bosun = {
description = "bosun metrics collector (part of Bosun)"; description = "bosun metrics collector (part of Bosun)";

3
nixos/modules/virtualisation/kubernetes.nix
View file

@ -12,7 +12,6 @@ in {
options.virtualisation.kubernetes = { options.virtualisation.kubernetes = {
package = mkOption { package = mkOption {
description = "Kubernetes package to use."; description = "Kubernetes package to use.";
default = pkgs.kubernetes;
type = types.package; type = types.package;
}; };
@ -443,6 +442,8 @@ in {
cfg.kubelet.enable || cfg.kubelet.enable ||
cfg.proxy.enable cfg.proxy.enable
) { ) {
virtualisation.kubernetes.package = mkDefault pkgs.kubernetes;
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
users.extraUsers = singleton { users.extraUsers = singleton {