nikkuss/process-compose-wrapper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error

Browse Source
This commit is contained in:
Nikkuss
2025-03-17 17:15:26 +04:00
parent cb19db3066
commit a15b6f3591
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/redis.nix
View File

@@ -17,11 +17,11 @@ in
let let
generateRedisConfig = '' generateRedisConfig = ''
cat > $RUNTIME_PATH/${name}.conf <<EOF cat > "$RUNTIME_PATH"/${name}.conf <<EOF
${lib.optionalString default_config '' ${lib.optionalString default_config ''
port ${builtins.toString port} port ${builtins.toString port}
${lib.optionalString (bind != null) "bind ${bind}"} ${lib.optionalString (bind != null) "bind ${bind}"}
${lib.optionalString (port == 0) "unixsocket $RUNTIME_PATH/${name}.sock"} ${lib.optionalString (port == 0) "unixsocket \"$RUNTIME_PATH/${name}.sock\""}
${lib.optionalString (port == 0) "unixsocketperm 700"} ${lib.optionalString (port == 0) "unixsocketperm 700"}
''} ''}
${extra_config} ${extra_config}
@@ -32,11 +32,11 @@ let
name = "run-redis"; name = "run-redis";
text = '' text = ''
set -euo pipefail set -euo pipefail
REDISDATA=$RUNTIME_PATH/${name}/ REDISDATA="$RUNTIME_PATH"/${name}/
${ ${
if (port == 0) then if (port == 0) then
'' ''
REDIS_UNIX_SOCKET = $RUNTIME_PATH/${name}.sock REDIS_UNIX_SOCKET = "$RUNTIME_PATH"/${name}.sock
export REDIS_UNIX_SOCKET export REDIS_UNIX_SOCKET
echo "Starting redis on unix socket ''${REDIS_UNIX_SOCKET}" echo "Starting redis on unix socket ''${REDIS_UNIX_SOCKET}"
'' ''
@@ -50,11 +50,11 @@ let
mkdir -p $REDISDATA mkdir -p $REDISDATA
fi fi
${generateRedisConfig} ${generateRedisConfig}
${package}/bin/redis-server $RUNTIME_PATH/${name}.conf --daemonize no --dir "$REDISDATA" ${package}/bin/redis-server "$RUNTIME_PATH"/${name}.conf --daemonize no --dir "$REDISDATA"
''; '';
}; };
tcpPing = "${package}/bin/redis-cli -p ${builtins.toString port} ping"; tcpPing = "${package}/bin/redis-cli -p ${builtins.toString port} ping";
unixPing = "${package}/bin/redis-cli -s $RUNTIME_PATH/${name}.sock ping"; unixPing = "${package}/bin/redis-cli -s \"$RUNTIME_PATH\"/${name}.sock ping";
in in
{ {
processes."${name}" = { processes."${name}" = {