@@ -1085,23 +1085,25 @@ end
10851085
10861086def check_i2p_host (host : String )
10871087 puts(" checking i2p configuration at #{ host } " )
1088- private_key = File .read_lines(HOSTS_DIR .join(host).join(" etc/i2pd/tunnels.conf" ))
1089- .select { |i | i.starts_with?(" keys =" ) }
1090- .map { |i | i.split(" = " )[1 ] }[0 ]
10911088 service_dir = Path [" /var/lib/i2pd" ]
1089+ private_keys = File .read_lines(HOSTS_DIR .join(host).join(" etc/i2pd/tunnels.conf" ))
1090+ .select { |i | i.starts_with?(" keys =" ) }
1091+ .map { |i | i.split(" = " )[1 ] }
10921092 check_manual_upload(host, owner: " i2pd" , group: " i2pd" , mode: 700 , path: service_dir)
1093- check_manual_upload(host, owner: " i2pd" , group: " i2pd" , mode: 440 , path: service_dir.join(private_key))
1093+ private_keys.each { | i | check_manual_upload(host, owner: " i2pd" , group: " i2pd" , mode: 440 , path: service_dir.join(i)) }
10941094end
10951095
10961096def check_tor_host (host : String )
10971097 puts(" checking tor configuration at #{ host } " )
1098- service_dir = Path [ File .read_lines(HOSTS_DIR .join(host).join(" etc/tor/torrc" ))
1098+ service_dirs = File .read_lines(HOSTS_DIR .join(host).join(" etc/tor/torrc" ))
10991099 .select { |i | i.starts_with?(" HiddenServiceDir" ) }
1100- .map { |i | i.split(" " )[1 ] }[0 ]]
1101- check_manual_upload(host, owner: " tor" , group: " tor" , mode: 700 , path: service_dir)
1102- check_manual_upload(host, owner: " tor" , group: " tor" , mode: 400 , path: service_dir.join(" hs_ed25519_secret_key" ))
1103- check_manual_upload(host, owner: " tor" , group: " tor" , mode: 400 , path: service_dir.join(" hs_ed25519_public_key" ))
1104- check_manual_upload(host, owner: " tor" , group: " tor" , mode: 400 , path: service_dir.join(" hostname" ), data: service_dir.basename)
1100+ .map { |i | Path [i.split(" " )[1 ]] }
1101+ service_dirs.map { |i |
1102+ check_manual_upload(host, owner: " tor" , group: " tor" , mode: 700 , path: i)
1103+ check_manual_upload(host, owner: " tor" , group: " tor" , mode: 400 , path: i.join(" hs_ed25519_secret_key" ))
1104+ check_manual_upload(host, owner: " tor" , group: " tor" , mode: 400 , path: i.join(" hs_ed25519_public_key" ))
1105+ check_manual_upload(host, owner: " tor" , group: " tor" , mode: 400 , path: i.join(" hostname" ), data: i.basename)
1106+ }
11051107end
11061108
11071109def check_ssh_hosts (ps : Array (Tuple (Int64 , String )))
0 commit comments