diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-05-22 17:48:29 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-05-22 17:48:29 +0300 |
| commit | f9feacfc7c389bacb937e24d7cccfe013271efaa (patch) | |
| tree | 264c2e15652058f1f1dc16fa4739d453c533ba58 /nixos/modules | |
| parent | db4d77779c9b52a35c5a4306d36e2727cba1b162 (diff) | |
| parent | c8a4562f5966e90cbbe04195b4a37a5d4a334f60 (diff) | |
| download | nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.gz nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.bz2 nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.lz nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.xz nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.tar.zst nixlib-f9feacfc7c389bacb937e24d7cccfe013271efaa.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/modules')
4 files changed, 11 insertions, 3 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix index e331889b9dd5..d27389b6a1c7 100644 --- a/nixos/modules/services/cluster/kubernetes/dashboard.nix +++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix @@ -70,7 +70,7 @@ in { resources = { limits = { cpu = "100m"; - memory = "50Mi"; + memory = "250Mi"; }; requests = { cpu = "100m"; diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 1dc7b44ee37b..05555353f207 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -128,9 +128,17 @@ in { you might need to specify it in <literal>extraPackages</literal>. ''; }; + + openFirewall = mkOption { + default = false; + type = types.bool; + description = "Whether to open the firewall for the specified port."; + }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + systemd.services.home-assistant = { description = "Home Assistant"; after = [ "network.target" ]; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 6aa6d9b271ff..429ce09ea68f 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -344,7 +344,7 @@ in default = [ "$HOME/.nix-defexpr/channels" - "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs" + "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos" "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" ]; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index e754a1e8718d..c4a2bd1f75fd 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -209,7 +209,7 @@ let '' echo "${cidr}" >> $state echo -n "adding route ${cidr}... " - if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then + if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then echo "done" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out" |