paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

sharding: Move chown/chmod into where the files are written.

Browse Source
This commit is contained in:
Alex Vandiver
2025-10-07 18:31:44 +00:00
committed by Tim Abbott
parent 6249c2f970
commit 2bd4c07fdb
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/lib/sharding.py
View File

@@ -1,8 +1,10 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse import argparse
import filecmp import filecmp
import grp
import json import json
import os import os
import pwd
import subprocess import subprocess
import sys import sys
@@ -77,6 +79,14 @@ def write_updated_configs() -> None:
data = {"shard_map": shard_map, "shard_regexes": shard_regexes} data = {"shard_map": shard_map, "shard_regexes": shard_regexes}
sharding_json_f.write(json.dumps(data) + "\n") sharding_json_f.write(json.dumps(data) + "\n")
for fh in (nginx_sharding_conf_f, sharding_json_f):
os.fchown(
fh.fileno(),
pwd.getpwnam("zulip").pw_uid,
grp.getgrnam("zulip").gr_gid,
)
os.fchmod(fh.fileno(), 0o644)
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description="Adjust Tornado sharding configuration", description="Adjust Tornado sharding configuration",

4
scripts/refresh-sharding-and-restart
View File

@@ -12,10 +12,6 @@ if ! [ -e /etc/zulip/nginx_sharding_map.conf.tmp ] || ! [ -e /etc/zulip/sharding
exit 1 exit 1
fi fi
chown zulip:zulip /etc/zulip/nginx_sharding_map.conf.tmp
chmod 644 /etc/zulip/nginx_sharding_map.conf.tmp
chown zulip:zulip /etc/zulip/sharding.json.tmp
chmod 644 /etc/zulip/sharding.json.tmp
mv /etc/zulip/nginx_sharding_map.conf.tmp /etc/zulip/nginx_sharding_map.conf mv /etc/zulip/nginx_sharding_map.conf.tmp /etc/zulip/nginx_sharding_map.conf
mv /etc/zulip/sharding.json.tmp /etc/zulip/sharding.json mv /etc/zulip/sharding.json.tmp /etc/zulip/sharding.json