From fb425cceac561bcb4e28506069de92aa3bc42c19 Mon Sep 17 00:00:00 2001
From: Felix Dallidet <felix.dallidet@normation.com>
Date: Fri, 2 Apr 2021 17:06:22 +0200
Subject: [PATCH] Fixes #19122: Shared-files folder is configured in several
 common bundle

---
 techniques/system/common/1.0/common.st                      | 2 +-
 techniques/system/distributePolicy/1.0/propagatePromises.cf | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/techniques/system/common/1.0/common.st b/techniques/system/common/1.0/common.st
index 9d3055998..75e06e7c0 100644
--- a/techniques/system/common/1.0/common.st
+++ b/techniques/system/common/1.0/common.st
@@ -2,7 +2,7 @@
 bundle common system_common {
   vars:
     "directiveId"           string => "&TRACKINGKEY&";
-    "sharedfiles_folder"    string => "&SHARED_FILES_FOLDER&";
+    "sharedfiles_folder"    string => "${g.shared_files}";
     "cf_serverd_port"       string => "&COMMUNITYPORT&";
     "community_port"        string => "${server_info.policy_server_port}";
     "uuid"                  string => "&UUID&";
diff --git a/techniques/system/distributePolicy/1.0/propagatePromises.cf b/techniques/system/distributePolicy/1.0/propagatePromises.cf
index 3f0d2bc19..248add750 100644
--- a/techniques/system/distributePolicy/1.0/propagatePromises.cf
+++ b/techniques/system/distributePolicy/1.0/propagatePromises.cf
@@ -55,8 +55,8 @@ bundle agent propagatePromises
         classes => if_else("promises_propagated", "could_not_propagate_promises");
 
     policy_server.!root_server.!disable_classic_sharedfiles::
-      "${system_common.sharedfiles_folder}"
-        copy_from    => remote("${server_info.policy_server}","${system_common.sharedfiles_folder}"),
+      "${g.shared_files}"
+        copy_from    => remote("${server_info.policy_server}","${g.shared_files}"),
         depth_search => recurse_visible("inf"),
         comment => "Fetching the files shared for the promises execution",
         classes => if_else("files_propagated", "could_not_propagate_files");
@@ -185,7 +185,7 @@ bundle agent propagatePromises
       "/usr/bin/rsync --archive --checksum --compress --sparse --delete ${server_info.policy_server}:${server_data}/ ${client_data}"
         classes => if_else("promises_propagated", "could_not_propagate_promises");
     policy_server.!root_server.rsync_sharedfiles::
-      "/usr/bin/rsync --archive --checksum --compress --sparse --delete ${server_info.policy_server}:${system_common.sharedfiles_folder}/ ${system_common.sharedfiles_folder}/"
+      "/usr/bin/rsync --archive --checksum --compress --sparse --delete ${server_info.policy_server}:${g.shared_files}/ ${g.shared_files}/"
         classes => if_else("files_propagated", "could_not_propagate_files");
 
 }