prosody
c2b9ff42db03
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 10270:c2b9ff42db03

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 21 Sep 2019 16:50:29 +0200
parent 10210:9fdda9fafc3c
parent 10257:26afb1a6d086
child 10369:9d20fca6a485
comparison
equal deleted inserted replaced
10267:9ef1e26594cb 10270:c2b9ff42db03
1140 target_hosts:remove("localhost"); 1140 target_hosts:remove("localhost");
1141 end 1141 end
1142 1142
1143 if modules:contains("proxy65") then 1143 if modules:contains("proxy65") then
1144 local proxy65_target = configmanager.get(host, "proxy65_address") or host; 1144 local proxy65_target = configmanager.get(host, "proxy65_address") or host;
1145 local A, AAAA = dns.lookup(idna.to_ascii(proxy65_target), "A"), dns.lookup(idna.to_ascii(proxy65_target), "AAAA"); 1145 if type(proxy65_target) == "string" then
1146 local prob = {}; 1146 local A, AAAA = dns.lookup(idna.to_ascii(proxy65_target), "A"), dns.lookup(idna.to_ascii(proxy65_target), "AAAA");
1147 if not A then 1147 local prob = {};
1148 table.insert(prob, "A"); 1148 if not A then
1149 end 1149 table.insert(prob, "A");
1150 if v6_supported and not AAAA then 1150 end
1151 table.insert(prob, "AAAA"); 1151 if v6_supported and not AAAA then
1152 end 1152 table.insert(prob, "AAAA");
1153 if #prob > 0 then 1153 end
1154 print(" File transfer proxy "..proxy65_target.." has no "..table.concat(prob, "/") 1154 if #prob > 0 then
1155 .." record. Create one or set 'proxy65_address' to the correct host/IP."); 1155 print(" File transfer proxy "..proxy65_target.." has no "..table.concat(prob, "/")
1156 .." record. Create one or set 'proxy65_address' to the correct host/IP.");
1157 end
1158 else
1159 print(" proxy65_address for "..host.." should be set to a string, unable to perform DNS check");
1156 end 1160 end
1157 end 1161 end
1158 1162
1159 for target_host in target_hosts do 1163 for target_host in target_hosts do
1160 local host_ok_v4, host_ok_v6; 1164 local host_ok_v4, host_ok_v6;