diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /nixos/tests/slurm.nix | |
parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) | |
download | nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.gz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.bz2 nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.lz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.xz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.zst nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.zip |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'nixos/tests/slurm.nix')
-rw-r--r-- | nixos/tests/slurm.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index 0dd00dfb04c2..dc4f62af5640 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -20,7 +20,6 @@ in { # TODO slrumd port and slurmctld port should be configurations and # automatically allowed by the firewall. networking.firewall.enable = false; - services.munge.enable = true; services.slurm = slurmconfig; }; in { @@ -28,7 +27,6 @@ in { { config, pkgs, ...}: { networking.firewall.enable = false; - services.munge.enable = true; services.slurm = { server.enable = true; } // slurmconfig; |