From 7f16d815af98cef7f2175a550c687fc143cbf47e Mon Sep 17 00:00:00 2001
From: Pat Riehecky <riehecky@fnal.gov>
Date: Fri, 27 Dec 2019 09:00:55 -0600
Subject: [PATCH] Permit storing CA list in config dir

---
 lib/Ocsinventory/Agent.pm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/Ocsinventory/Agent.pm b/lib/Ocsinventory/Agent.pm
index 6de71b73..29f131e9 100644
--- a/lib/Ocsinventory/Agent.pm
+++ b/lib/Ocsinventory/Agent.pm
@@ -158,7 +158,18 @@ sub run {
 
     # Setting SSL CA file path if not set in configuration
     unless ($config->{config}{ca}) {
-        $config->{config}{ca} = $config->{config}{vardir}."/cacert.pem";
+        # use server specific cacert.pem if it exists
+        $config->{config}{ca} = $config->{config}{vardir}.'/cacert.pem';
+
+        # if no server specific cacert.pem, look for a bundle in our config dir
+        unless (-e $config->{config}{vardir}.'/cacert.pem') {
+            foreach (@{$config->{config}{etcdir}}) {
+                if (-e $_.'/ocsinventory-agent-cacert.pem') {
+                    $config->{config}{ca} = $_.'/ocsinventory-agent-cacert.pem';
+                    last;
+                }
+            }
+        }
     }
 
 ################################################################################################################