From 11e7e58ca037c10fb29c09d08b78a1e2a0fee288 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Fri, 10 Mar 2017 09:39:49 +0100
Subject: Added cfengine_modules submodule

---
 failsafe.cf | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'failsafe.cf')

diff --git a/failsafe.cf b/failsafe.cf
index 354e000..ba33f7d 100644
--- a/failsafe.cf
+++ b/failsafe.cf
@@ -52,6 +52,7 @@ bundle agent failsafe_update {
             "$(sys.inputdir)"
                 copy_from => failsafe_scp("$(masterfiles_dir_remote)"),
                 depth_search => failsafe_recurse("inf"),
+                action => failsafe_u_immediate,
                 file_select => failsafe_exclude_vcs_files,
                 classes => failsafe_results("namespace", "inputdir_update");
         inputdir_update_error::
@@ -62,6 +63,14 @@ bundle agent failsafe_update {
                 classes => failsafe_results("namespace", "inputdir_update"),
                 comment => "If we failed to fetch policy we try again using the legacy default in case we are fetching policy
                             from a hub that is not serving masterfiles via a shortcut.";
+        !am_policy_hub::
+            "$(sys.workdir)/modules"
+                copy_from => failsafe_scp("modules"),
+                depth_search => failsafe_recurse("inf"),
+                perms => failsafe_u_m("755"),
+                action => failsafe_u_immediate,
+                file_select => failsafe_exclude_vcs_files,
+                classes => failsafe_results("namespace", "modulesdir_update");
     processes:
         !(windows|systemd)::
             "cf-serverd" restart_class => "cf_serverd_not_running";
@@ -72,7 +81,7 @@ bundle agent failsafe_update {
             "$(sys.cf_execd)" classes => failsafe_results("namespace", "cf_execd_running");
         cf_serverd_not_running::
             "$(sys.cf_serverd)" classes => failsafe_results("namespace", "cf_serverd_running");
-        !cfengine3_service_running::
+        !cfengine3_service_running|(systemd.inputdir_update_repaired)::
             "/bin/systemctl restart cfengine3"
                 contain => failsafe_noshell_and_silent,
                 classes => failsafe_results("namespace", "systemctl_restart_cfengine3");
@@ -180,3 +189,13 @@ body contain failsafe_noshell_and_silent
     useshell => "noshell";
     no_output => true;
 }
+
+body perms failsafe_u_m(p)
+{
+    mode  => "$(p)";
+}
+
+body action failsafe_u_immediate
+{
+    ifelapsed => "0";
+}
-- 
cgit v1.2.3