diff options
author | Peter Palfrader <peter@palfrader.org> | 2017-01-02 12:43:48 +0100 |
---|---|---|
committer | Peter Palfrader <peter@palfrader.org> | 2017-01-02 12:43:48 +0100 |
commit | e8580682424ab4df49ef31c5ce8d6911e7b84425 (patch) | |
tree | 08b9e4f74842a17a984c79673867311e8183e78e | |
parent | ca7139c9c959f06cf0db4f852fd74680070ac58f (diff) |
Only set remote on servers
-rwxr-xr-x | Generate | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -656,15 +656,17 @@ hostlist.each{ |host| remote_addr += peer['host_address_extra'] if peer['host_address_extra'] remote_port = [ host['inet_port'][ peer['name'] ]['remote'] ] remote_port += peer['host_port_extra'] if peer['host_port_extra'] - if remote_addr.size > 0 then - remote_addr.each do |raddr| - remote_port.each do |rport| - conffile.puts "remote #{raddr} #{rport}" + if not host_is_server + if remote_addr.size > 0 then + remote_addr.each do |raddr| + remote_port.each do |rport| + conffile.puts "remote #{raddr} #{rport}" + end end + else + throw "have host_port_extra but no host_address(_extra)" if peer['host_port_extra'] + conffile.puts "rport #{host['inet_port'][ peer['name'] ]['remote']}" end - else - throw "have host_port_extra but no host_address(_extra)" if peer['host_port_extra'] - conffile.puts "rport #{host['inet_port'][ peer['name'] ]['remote']}" end conffile.puts "lport #{host['inet_port'][ peer['name'] ]['local']}" unless host['accepts'].nil? if host['accepts'].nil? |