From 06c8429111ede537bf16b76866f3a1bffdffead2 Mon Sep 17 00:00:00 2001
From: Jaime Fullaondo <jaime.fullaondo@datadoghq.com>
Date: Fri, 4 Aug 2023 19:35:38 +0200
Subject: [PATCH] [dd-fips-proxy] addressing review feedback.

---
 attributes/default.rb    | 8 +++++++-
 recipes/dd-fips-proxy.rb | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 77c8940e..d3611b03 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -42,7 +42,7 @@
 default['datadog']['agent_version'] = nil # nil to install latest
 # Agent flavor to install, acceptable values are "datadog-agent", "datadog-iot-agent"
 default['datadog']['agent_flavor'] = 'datadog-agent' # "datadog-agent" to install the datadog-agent package
-# default['datadog']['fips_proxy_version'] = '0.1.0'
+default['datadog']['fips_proxy_version'] = nil
 default['datadog']['agent_version'] = nil # nil to install latest
 # Datadog FIPS proxy package name:
 default['datadog']['fips_proxy_package_name'] = 'datadog-fips-proxy' # "datadog-fips-proxy" to install the datadog-fips-proxy package
@@ -260,6 +260,12 @@
 # Start agent or not
 default['datadog']['agent_start'] = true
 
+# Enable the fips-proxy to start at boot.
+default['datadog']['fips_proxy_enable'] = true
+
+# Start fips_proxy or not
+default['datadog']['fips_proxy_start'] = true
+
 # installation info
 default['datadog']['install_info_enabled'] = true
 
diff --git a/recipes/dd-fips-proxy.rb b/recipes/dd-fips-proxy.rb
index 422599d2..686669ba 100644
--- a/recipes/dd-fips-proxy.rb
+++ b/recipes/dd-fips-proxy.rb
@@ -44,6 +44,7 @@
   mode '0766'
   content lazy { ::File.open('/etc/datadog-fips-proxy/datadog-fips-proxy.cfg.example').read }
   not_if { ::File.exist?('/etc/datadog-fips-proxy/datadog-fips-proxy.cfg') }
+  notifies :restart, 'service[datadog-fips-proxy]' if node['datadog']['fips_proxy_start']
   action :create
 end