Merge pull request #121336 from markuskowa/upd-slurm
nixos/slurm: 20.11.5.1 -> 20.11.6.1, improve security
This commit is contained in:
commit
741ed21bea
@ -403,9 +403,7 @@ in
|
|||||||
requires = [ "munged.service" "mysql.service" ];
|
requires = [ "munged.service" "mysql.service" ];
|
||||||
|
|
||||||
preStart = ''
|
preStart = ''
|
||||||
cp ${slurmdbdConf} ${configPath}
|
install -m 600 -o ${cfg.user} -T ${slurmdbdConf} ${configPath}
|
||||||
chmod 600 ${configPath}
|
|
||||||
chown ${cfg.user} ${configPath}
|
|
||||||
${optionalString (cfg.dbdserver.storagePassFile != null) ''
|
${optionalString (cfg.dbdserver.storagePassFile != null) ''
|
||||||
echo "StoragePass=$(cat ${cfg.dbdserver.storagePassFile})" \
|
echo "StoragePass=$(cat ${cfg.dbdserver.storagePassFile})" \
|
||||||
>> ${configPath}
|
>> ${configPath}
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "slurm";
|
pname = "slurm";
|
||||||
version = "20.11.5.1";
|
version = "20.11.6.1";
|
||||||
|
|
||||||
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
|
||||||
# because the latter does not keep older releases.
|
# because the latter does not keep older releases.
|
||||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||||||
repo = "slurm";
|
repo = "slurm";
|
||||||
# The release tags use - instead of .
|
# The release tags use - instead of .
|
||||||
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
|
||||||
sha256 = "1anzjv9sdl1a3j6sxsy2q8dy4dax1a4yqc9rnprlzymjkgb8hy75";
|
sha256 = "1c2dqqddw5bfb27smq7rqa7v1wymdj155ky50rbyvl36pmhc9djp";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user