summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authormarkuskowa <markus.kowalewski@gmail.com>2021-03-18 14:48:28 +0100
committerGitHub <noreply@github.com>2021-03-18 14:48:28 +0100
commit2af233afacd91a7f20d435b4097522e63a849e83 (patch)
tree6900ca11c68b9eccc4e7e66e380773671e0dde3e /nixos
parent1a48509bb08a16c93717737d3bb1600dd81d026a (diff)
parentc923b4c71be3aad3892c32834903fc4922be342a (diff)
downloadnixpkgs-2af233afacd91a7f20d435b4097522e63a849e83.tar
nixpkgs-2af233afacd91a7f20d435b4097522e63a849e83.tar.gz
nixpkgs-2af233afacd91a7f20d435b4097522e63a849e83.tar.bz2
nixpkgs-2af233afacd91a7f20d435b4097522e63a849e83.tar.lz
nixpkgs-2af233afacd91a7f20d435b4097522e63a849e83.tar.xz
nixpkgs-2af233afacd91a7f20d435b4097522e63a849e83.tar.zst
nixpkgs-2af233afacd91a7f20d435b4097522e63a849e83.zip
Merge pull request #115839 from markuskowa/fix-slurm
nixos/slurm: expose to path config files
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/computing/slurm/slurm.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 7363441e538..0b52f8afed8 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -274,6 +274,15 @@ in
         '';
       };
 
+      etcSlurm = mkOption {
+        type = types.path;
+        internal = true;
+        default = etcSlurm;
+        description = ''
+          Path to directory with slurm config files. This option is set by default from the
+          Slurm module and is meant to make the Slurm config file available to other modules.
+        '';
+      };
 
     };
 
@@ -308,7 +317,7 @@ in
           #!/bin/sh
           if [ -z "$SLURM_CONF" ]
           then
-            SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@"
+            SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
           else
             "$EXE" "\$0"
           fi