This commit is contained in:
Mateusz Gruszczyński
2025-10-24 08:23:40 +02:00
parent 23fbf23b20
commit 6bb16ce710

View File

@@ -395,10 +395,10 @@ exec sudo -n /usr/sbin/angie "$@"
Path("/etc/nginx/conf.d/include").mkdir(parents=True, exist_ok=True) Path("/etc/nginx/conf.d/include").mkdir(parents=True, exist_ok=True)
with step("Setting resolver(s) and cache directories"): with step("Setting resolver(s) and cache directories"):
write_resolvers_conf(ipv6_enabled) write_resolvers_conf(ipv6_enabled)
for p in ["/var/lib/angie/cache/public", "/var/lib/angie/cache/private"]: for p in ["/var/lib/angie/cache/public", "/var/lib/angie/cache/private"]:
Path(p).mkdir(parents=True, exist_ok=True) Path(p).mkdir(parents=True, exist_ok=True)
os.chmod(p, 0o755) os.chmod(p, 0o755)
with step("Installing corrected systemd unit for Angie"): with step("Installing corrected systemd unit for Angie"):
write_file(Path("/etc/systemd/system/angie.service"), ANGIE_UNIT, 0o644) write_file(Path("/etc/systemd/system/angie.service"), ANGIE_UNIT, 0o644)
@@ -753,7 +753,7 @@ def gather_versions(npm_app_version: str):
angie_v = run_out(["bash","-lc","angie -v 2>&1 | awk 'NR==1{print $3}'"], check=False).strip() angie_v = run_out(["bash","-lc","angie -v 2>&1 | awk 'NR==1{print $3}'"], check=False).strip()
node_v = run_out(["bash","-lc","node -v | sed 's/^v//'"], check=False).strip() node_v = run_out(["bash","-lc","node -v | sed 's/^v//'"], check=False).strip()
yarn_v = run_out(["bash","-lc","yarn -v || yarnpkg -v"], check=False).strip() yarn_v = run_out(["bash","-lc","yarn -v || yarnpkg -v"], check=False).strip()
return ip, angie_v, node_v, yarn_v, npm_app_versio return ip, angie_v, node_v, yarn_v, npm_app_version
def update_motd(enabled: bool, info, ipv6_enabled: bool): def update_motd(enabled: bool, info, ipv6_enabled: bool):
if not enabled: if not enabled: