Fediversity/vars
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from KiaraGrouwstra/rights

Browse source 
add file rights: owner, group, mode
This commit is contained in:
lassulus 2025-08-21 14:32:11 +02:00 • committed by GitHub
commit 9c9be8e258
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
backends/on-machine.nix
View file

@ -46,6 +46,12 @@ let
fi
'') (lib.attrValues gen.files)}
# outputs
out=$(mktemp -d)
trap 'rm -rf $out' EXIT
export out
mkdir -p "$out"
if [ $all_files_missing = false ] && [ $all_files_present = false ] ; then
echo "Inconsistent state for generator: ${gen.name}"
exit 1
@ -80,12 +86,6 @@ let
'') (lib.attrValues config.vars.generators.${input}.files)}
'') gen.dependencies}
# outputs
out=$(mktemp -d)
trap 'rm -rf $out' EXIT
export out
mkdir -p "$out"
(
# prepare PATH
unset PATH
@ -112,8 +112,15 @@ let
mkdir -p "$(dirname "$OUT_FILE")"
mv "$out"/${file.name} "$OUT_FILE"
'') (lib.attrValues gen.files)}
rm -rf "$out"
fi
# move the files to the correct location
${lib.concatMapStringsSep "\n" (file: ''
OUT_FILE="$OUT_DIR"/${if file.secret then "secret" else "public"}/${file.generator}/${file.name}
chown ${file.owner}:${file.group} "''${OUT_FILE}"
chmod ${file.mode} "''${OUT_FILE}"
'') (lib.attrValues gen.files)}
rm -rf "$out"
'') sortedGenerators}
'';
};

15
options.nix
View file

@ -82,6 +82,21 @@
default = generator.config.name;
defaultText = "Name of the generator";
};
owner = lib.mkOption {
description = "The user name or id that will own the file.";
type = lib.types.str;
default = "root";
};
group = lib.mkOption {
description = "The group name or id that will own the file.";
type = lib.types.str;
default = "root";
};
mode = lib.mkOption {
description = "The unix file mode of the file. Must be a 4-digit octal number.";
type = lib.types.strMatching "^[0-7]{4}$";
default = if file.config.group == "root" then "0400" else "0440";
};
deploy = lib.mkOption {
description = ''
Whether the file should be deployed to the target machine.