X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/13c8616cfdbe61a644812acf4163a975f24b9401..6ab5fb9c6d2e0d309835648e78333ed40d654885:/cookbooks/networking/templates/default/wireguard.network.erb?ds=sidebyside diff --git a/cookbooks/networking/templates/default/wireguard.network.erb b/cookbooks/networking/templates/default/wireguard.network.erb index b8114382c..481fe14ff 100644 --- a/cookbooks/networking/templates/default/wireguard.network.erb +++ b/cookbooks/networking/templates/default/wireguard.network.erb @@ -2,11 +2,17 @@ Name=wg0 [Network] +<% if node.internal_ipaddress -%> +Address=<%= node.internal_ipaddress %>/32 +<% end -%> +<% if node[:networking][:private_address] -%> +Address=<%= node[:networking][:private_address] %>/32 +<% end -%> Address=<%= node[:networking][:wireguard][:address] %>/128 [Route] Destination=fd43:e709:ea6d:1::/64 -<% node[:networking][:wireguard][:peers].each do |peer| -%> +<% node[:networking][:wireguard][:peers].sort_by { |p| p[:public_key] }.each do |peer| -%> <% Array(peer[:allowed_ips]).sort.each do |ip| -%> <% unless ip =~ /^fd43:e709:ea6d:1::/ -%>