movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/akkoma: deal with $RUNTIME_DIRECTORY containing multiple entries

Browse source 
this fixes issues with confined module tests.

see https://github.com/NixOS/nixpkgs/pull/313794#issuecomment-2126909110
This commit is contained in:
tcmal 2024-05-25 18:40:50 +01:00
parent 05a94bb1ad
commit a247fc94b4
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/web-apps/akkoma.nix
View file

@ -119,7 +119,7 @@ let
-o ${escapeShellArg cfg.user } \ -o ${escapeShellArg cfg.user } \
-g ${escapeShellArg cfg.group} \ -g ${escapeShellArg cfg.group} \
<(hexdump -n 16 -e '"%02x"' /dev/urandom) \ <(hexdump -n 16 -e '"%02x"' /dev/urandom) \
"$RUNTIME_DIRECTORY/cookie" "''${RUNTIME_DIRECTORY%%:*}/cookie"
''; '';
}; };
@ -131,7 +131,7 @@ let
-o ${escapeShellArg cfg.user} \ -o ${escapeShellArg cfg.user} \
-g ${escapeShellArg cfg.group} \ -g ${escapeShellArg cfg.group} \
${escapeShellArg cfg.dist.cookie._secret} \ ${escapeShellArg cfg.dist.cookie._secret} \
"$RUNTIME_DIRECTORY/cookie" "''${RUNTIME_DIRECTORY%%:*}/cookie"
''; '';
}; };
@ -181,7 +181,7 @@ let
name = "akkoma-config"; name = "akkoma-config";
runtimeInputs = with pkgs; [ coreutils replace-secret ]; runtimeInputs = with pkgs; [ coreutils replace-secret ];
text = '' text = ''
cd "$RUNTIME_DIRECTORY" cd "''${RUNTIME_DIRECTORY%%:*}"
tmp="$(mktemp config.exs.XXXXXXXXXX)" tmp="$(mktemp config.exs.XXXXXXXXXX)"
trap 'rm -f "$tmp"' EXIT TERM trap 'rm -f "$tmp"' EXIT TERM
@ -279,7 +279,7 @@ let
cd "${cfg.package}" cd "${cfg.package}"
RUNTIME_DIRECTORY="''${RUNTIME_DIRECTORY:-/run/akkoma}" RUNTIME_DIRECTORY="''${RUNTIME_DIRECTORY:-/run/akkoma}"
AKKOMA_CONFIG_PATH="$RUNTIME_DIRECTORY/config.exs" \ AKKOMA_CONFIG_PATH="''${RUNTIME_DIRECTORY%%:*}/config.exs" \
ERL_EPMD_ADDRESS="${cfg.dist.address}" \ ERL_EPMD_ADDRESS="${cfg.dist.address}" \
ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \ ERL_EPMD_PORT="${toString cfg.dist.epmdPort}" \
ERL_FLAGS=${lib.escapeShellArg (lib.escapeShellArgs ([ ERL_FLAGS=${lib.escapeShellArg (lib.escapeShellArgs ([
@ -287,7 +287,7 @@ let
"-kernel" "inet_dist_listen_min" (toString cfg.dist.portMin) "-kernel" "inet_dist_listen_min" (toString cfg.dist.portMin)
"-kernel" "inet_dist_listen_max" (toString cfg.dist.portMax) "-kernel" "inet_dist_listen_max" (toString cfg.dist.portMax)
] ++ cfg.dist.extraFlags))} \ ] ++ cfg.dist.extraFlags))} \
RELEASE_COOKIE="$(<"$RUNTIME_DIRECTORY/cookie")" \ RELEASE_COOKIE="$(<"''${RUNTIME_DIRECTORY%%:*}/cookie")" \
RELEASE_NAME="akkoma" \ RELEASE_NAME="akkoma" \
exec "${cfg.package}/bin/$(basename "$0")" "$@" exec "${cfg.package}/bin/$(basename "$0")" "$@"
''; '';
@ -984,7 +984,7 @@ in {
RemainAfterExit = true; RemainAfterExit = true;
UMask = "0077"; UMask = "0077";
RuntimeDirectory = "akkoma"; RuntimeDirectory = mkBefore "akkoma";
ExecStart = mkMerge [ ExecStart = mkMerge [
(mkIf (cfg.dist.cookie == null) [ genScript ]) (mkIf (cfg.dist.cookie == null) [ genScript ])