From 5f4f78d55d832d31639119804e7ff9f69ecdda41 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Sun, 27 Aug 2017 23:31:08 +0200
Subject: Updated usebundle system to include caller information un report

---
 services/common.cf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'services/common.cf')

diff --git a/services/common.cf b/services/common.cf
index b5e7b75..8efeeaf 100644
--- a/services/common.cf
+++ b/services/common.cf
@@ -12,7 +12,7 @@ bundle agent common
             "$(this.bundle): /etc/hosts repaired" ifvarclass => "common_hosts_files_repaired";
 }
 
-bundle agent home_skel(user)
+bundle agent home_skel(caller, user)
 {
     files:
         any::
@@ -20,26 +20,26 @@ bundle agent home_skel(user)
                 create => "true",
                 copy_from => seed_cp("/etc/skel"),
                 depth_search => recurse("inf"),
-                classes => if_repaired("home_skel_$(user)_repaired");
+                classes => if_repaired("$(caller)_home_skel_$(user)_repaired");
     reports:
         any::
-            "$(this.bundle): /home/$(user) initialized" ifvarclass => "home_skel_$(user)_repaired";
+            "$(caller): /home/$(user) initialized" ifvarclass => "$(caller)_home_skel_$(user)_repaired";
 }
 
-bundle agent install_package(package)
+bundle agent install_package(caller, package)
 {
     packages:
         debian|ubuntu::
             "$(package)"
                 policy => "present",
                 package_module => apt_get,
-                classes => if_repaired("common_package_$(package)_add_repaired");
+                classes => if_repaired("$(caller)_common_package_$(package)_add_repaired");
         freebsd::
             "$(package)"
                 policy => "present",
                 package_module => pkg,
-                classes => if_repaired("common_package_$(package)_add_repaired");
+                classes => if_repaired("$(caller)_common_package_$(package)_add_repaired");
     reports:
         any::
-            "$(this.bundle): $(package) installed" ifvarclass => "common_package_$(package)_add_repaired";
+            "$(caller): $(package) installed" ifvarclass => "$(caller)_common_package_$(package)_add_repaired";
 }
-- 
cgit v1.2.3