nominatim: add new dependency for updated osm2pgsql

[chef.git] / cookbooks / networking / templates / default / wireguard.netdev.erb

diff --git a/cookbooks/networking/templates/default/wireguard.netdev.erb b/cookbooks/networking/templates/default/wireguard.netdev.erb
index 7866f97a4d093fb5bd25e5154c2767d6f3f07b4f..979e68eee2e06cff62bd3b97a256a297edbe6a06 100644 (file)
--- a/cookbooks/networking/templates/default/wireguard.netdev.erb
+++ b/cookbooks/networking/templates/default/wireguard.netdev.erb
@@ -3,21 +3,13 @@ Name=wg0
 Kind=wireguard
 
 [WireGuard]
 Kind=wireguard
 
 [WireGuard]

-<% if node[:lsb][:release].to_f < 20.04 -%>
-PrivateKey=<%= IO.read("/var/lib/systemd/wireguard/private.key").chomp %>
-<% else -%>

 PrivateKeyFile=/var/lib/systemd/wireguard/private.key
 PrivateKeyFile=/var/lib/systemd/wireguard/private.key

-<% end -%>

 ListenPort=51820
 ListenPort=51820

-<% node[:networking][:wireguard][:peers].each do |peer| -%>
+<% node[:networking][:wireguard][:peers].sort_by { |p| p[:public_key] }.each do |peer| -%>

 
 [WireGuardPeer]
 PublicKey=<%= peer[:public_key] %>
 
 [WireGuardPeer]
 PublicKey=<%= peer[:public_key] %>

-<% if node[:lsb][:release].to_f < 20.04 -%>
-PresharedKey=<%= IO.read("/var/lib/systemd/wireguard/preshared.key").chomp %>
-<% else -%>

 PresharedKeyFile=/var/lib/systemd/wireguard/preshared.key
 PresharedKeyFile=/var/lib/systemd/wireguard/preshared.key

-<% end -%>

 AllowedIPs=<%= Array(peer[:allowed_ips]).sort.join(",") %>
 <% if peer[:endpoint] -%>
 Endpoint=<%= peer[:endpoint] %>
 AllowedIPs=<%= Array(peer[:allowed_ips]).sort.join(",") %>
 <% if peer[:endpoint] -%>
 Endpoint=<%= peer[:endpoint] %>