From 6da9fa73d322d5e59eb2202c81e804924dfd0cf6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 14 Sep 2020 16:16:49 +0000 Subject: [PATCH] Generate wireguard addresses without systemd-id128 --- cookbooks/networking/attributes/default.rb | 3 --- cookbooks/networking/metadata.rb | 3 +-- cookbooks/networking/recipes/default.rb | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb index 6881fcafe..8d30dd17c 100644 --- a/cookbooks/networking/attributes/default.rb +++ b/cookbooks/networking/attributes/default.rb @@ -1,5 +1,3 @@ -wireguard_id = %x(systemd-id128 machine-id -a 3f36688c233848dfa84e4b176195622e) - default[:networking][:firewall][:enabled] = true default[:networking][:firewall][:inet] = [] default[:networking][:firewall][:inet6] = [] @@ -15,6 +13,5 @@ default[:networking][:search] = [] default[:networking][:dnssec] = "allow-downgrade" default[:networking][:hostname] = node.name default[:networking][:wireguard][:enabled] = false -default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0, 4]}:#{wireguard_id[4, 4]}:#{wireguard_id[8, 4]}:#{wireguard_id[12, 4]}" default[:networking][:wireguard][:keepalive] = false default[:networking][:wireguard][:peers] = [] diff --git a/cookbooks/networking/metadata.rb b/cookbooks/networking/metadata.rb index 3d2944c15..c37012709 100644 --- a/cookbooks/networking/metadata.rb +++ b/cookbooks/networking/metadata.rb @@ -5,5 +5,4 @@ license "Apache-2.0" description "Configures networking" version "1.0.0" - -supports "ubuntu" +depends "chef" diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 053d98b78..ac847bfc7 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -186,6 +186,10 @@ package "cloud-init" do end if node[:networking][:wireguard][:enabled] + wireguard_id = persistent_token("networking", "wireguard") + + node.default[:networking][:wireguard][:address] = "fd43:e709:ea6d:1:#{wireguard_id[0, 4]}:#{wireguard_id[4, 4]}:#{wireguard_id[8, 4]}:#{wireguard_id[12, 4]}" + package "wireguard-tools" do compile_time true end -- 2.45.1