Skip to content

Commit dadd56d

Browse files
committed
Update
1 parent c7e14a0 commit dadd56d

2 files changed

Lines changed: 4 additions & 16 deletions

File tree

_do.cr

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ def sync(hosts : Array(String))
409409
spawn do
410410
begin
411411
sync_host(host, hosts_files: hosts_files, common_files: common_files, mirror_to: mirror[host]?)
412-
continue_download(host, BACKUP_DIR.join(host), [Path["var/log/nginx/access.log"]])
412+
download(host, BACKUP_DIR.join(host), [Path["var/log/nginx/access.log"]])
413413
done.send(nil)
414414
rescue e
415415
error("host=#{host} sync failure: #{e}\n")
@@ -453,21 +453,9 @@ def sync_host(host : String, *, hosts_files : Hash(String, Set(Path)), common_fi
453453
ssh(host, ["sudo etckeeper commit sync 2>>/dev/null"])
454454
end
455455

456-
def continue_download(host : String, local_dir : Path, files : Enumerable(Path))
456+
def download(host : String, local_dir : Path, files : Enumerable(Path))
457457
Dir.mkdir_p(local_dir)
458-
checks = files
459-
.map { |i| [i, local_dir.join(i)] }
460-
.select { |(i, local_full)| File.file?(local_full) }
461-
.map { |(i, local_full)|
462-
command = "head -c #{File.size(local_full)} /#{i} | sha256sum | cut -d' ' -f 1"
463-
expected_checksum = `sha256sum #{local_full} | cut -d' ' -f 1`.strip
464-
[command, expected_checksum]
465-
}
466-
checksums = ssh(host, checks.map { |(command, _)| command }).split('\n').reject { |i| i.empty? }
467-
raise "unexpected output" unless checks.size == checksums.size
468-
failures = checksums.zip(checks.map { |(_, expected_checksum)| expected_checksum }).reject { |a, b| a == b }
469-
raise "some checksums failed: #{failures}" unless failures.empty?
470-
rsync(local_dir, files, ["--append-verify", "#{host}:/", "."])
458+
rsync(local_dir, files, ["#{host}:/", "."])
471459
end
472460

473461
def add_user_commands(user : String)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
wstunnel_args="server --no-color=true --log-lvl=off ws://localhost:9999"
1+
wstunnel_args="server --no-color=true --log-lvl=debug --dns-resolver-prefer-ipv4 --dns-resolver=dns+https://1.1.1.1?sni=cloudflare-dns.com ws://127.0.0.1:9999"

0 commit comments

Comments
 (0)