lfg2025/archy
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Keep listener repair backups in their own support directory

Browse Source
This commit is contained in:
archipelago
2026-10-06 23:56:52 -04:00
parent 58a0c6ef64
commit fdee8658c3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/archipelago/src/bootstrap.rs
+2 -2
View File
@@ -1250,12 +1250,12 @@ async fn run_nginx_listener_repair() -> Result<bool> {
// Backups must never be written in sites-enabled: nginx includes every // Backups must never be written in sites-enabled: nginx includes every
// file there, and a backup would introduce duplicate server directives. // file there, and a backup would introduce duplicate server directives.
let backup = format!( let backup = format!(
"/var/lib/archipelago/support/nginx-listeners-{repair_id}-{}.conf", "/var/lib/archipelago/support/nginx-listeners/{repair_id}-{}.conf",
seen.len() seen.len()
); );
let target = format!("'{}'", target.to_string_lossy().replace('\'', "'\\''")); let target = format!("'{}'", target.to_string_lossy().replace('\'', "'\\''"));
let script = format!( let script = format!(
"set -eu\ninstall -d -m 0700 /var/lib/archipelago/support\ncp -- {target} {backup}\nchmod 0600 {backup}\ninstall -m 0644 {staged} {target}\n\ "set -eu\ninstall -d -m 0700 /var/lib/archipelago/support/nginx-listeners\ncp -- {target} {backup}\nchmod 0600 {backup}\ninstall -m 0644 {staged} {target}\n\
if ! nginx -t 2>/dev/null; then install -m 0644 {backup} {target}; exit 3; fi\nexit 0\n" if ! nginx -t 2>/dev/null; then install -m 0644 {backup} {target}; exit 3; fi\nexit 0\n"
); );
let status = host_sudo(&["sh", "-lc", &script]).await?; let status = host_sudo(&["sh", "-lc", &script]).await?;