Skip to content

Commit fa8e1a8

Browse files
committed
Update prepare-config script
- Reduce verbosity - Only set permissions of dynamic config file (not it's containing directory) - Correctly use redis user and group from template
1 parent 06ceaa0 commit fa8e1a8

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

templates/prepare-config.sh.j2

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22

3-
set -ex
3+
set -e
4+
5+
redis_user="{{ redis_user }}"
6+
redis_group="{{ redis_group }}"
47

58
static_cfg="$1"
69
dyn_cfg="$2"
@@ -29,6 +32,6 @@ else
2932
dyn_cfg_data=$(sed -n '/CONFIG REWRITE/,$p' "$dyn_cfg";
3033
grep -F 'sentinel myid' "$dyn_cfg" || :)
3134
cat "$static_cfg" - <<< "$dyn_cfg_data" | filter_cfg > "$dyn_cfg"
35+
chown "$redis_user:$redis_group" "$dyn_cfg"
36+
chmod 0640 "$dyn_cfg"
3237
fi
33-
34-
chown -R redis:redis "$(dirname "$dyn_cfg")"

0 commit comments

Comments
 (0)