From 4054fddfa555f65d2019ffd53abffed1653da5c6 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 4 Feb 2022 15:59:57 -0800 Subject: [PATCH] always generate telemetry_id; conditionally upload --- .../cookbooks/firezone/recipes/telemetry.rb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/omnibus/cookbooks/firezone/recipes/telemetry.rb b/omnibus/cookbooks/firezone/recipes/telemetry.rb index 56ea73534..b5800f967 100644 --- a/omnibus/cookbooks/firezone/recipes/telemetry.rb +++ b/omnibus/cookbooks/firezone/recipes/telemetry.rb @@ -12,6 +12,15 @@ include_recipe 'firezone::config' disable_telemetry_path = "#{node['firezone']['install_directory']}/.disable-telemetry" telemetry_id_path = "#{node['firezone']['install_directory']}/.telemetry-id" +file 'telemetry_id' do + action :create_if_missing + path telemetry_id_path + mode '0644' + user node['firezone']['user'] + group node['firezone']['group'] + content SecureRandom.uuid() +end + if node['firezone']['telemetry']['enabled'] == false file 'disable_telemetry' do path disable_telemetry_path @@ -19,18 +28,11 @@ if node['firezone']['telemetry']['enabled'] == false user node['firezone']['user'] group node['firezone']['group'] end + node['firezone']['telemetry_id'] = nil else file 'disable_telemetry' do path disable_telemetry_path action :delete end - file 'telemetry_id' do - action :create_if_missing - path telemetry_id_path - mode '0644' - user node['firezone']['user'] - group node['firezone']['group'] - content SecureRandom.uuid() - end node['firezone']['telemetry_id'] = File.read(telemetry_id_path) end