Merge branch 'branches/rudder/3.1' into branches/rudder/4.0

Normation · Jun 7, 2017 · c34b311 · c34b311
2 parents b9cd434 + afeee9f
commit c34b311
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/techniques/system/common/1.0/cron-setup.st b/techniques/system/common/1.0/cron-setup.st
@@ -58,13 +58,13 @@ bundle agent setup_cronjob
       # Cleanup the pre-4.0 crontab
       "/var/spool/cron/crontabs/root"
         edit_defaults => noempty_backup,
-        edit_line => delete_lines_matching("0,5,10,15,20,25,30,35,40,45,50,55 \* \* \* \* /usr/bin/test -x /opt/rudder/bin/check-rudder-agent \&\& /opt/rudder/bin/check-rudder-agent >/dev/null");
+        edit_line => delete_lines_matching("0,5,10,15,20,25,30,35,40,45,50,55 \* \* \* \* /usr/bin/test -x /opt/rudder/bin/rudder \&\& /opt/rudder/bin/rudder agent check >/dev/null");
 
       # Add Rudder entry
       "/var/spool/cron/crontabs/root"
         create        => "true",
         perms         => mog("600", "root", "cron"),
-        edit_line     => insert_lines("0,5,10,15,20,25,30,35,40,45,50,55 * * * * /usr/bin/test -x /opt/rudder/bin/rudder \&\& /opt/rudder/bin/rudder agent check >/dev/null"),
+        edit_line     => insert_lines("0,5,10,15,20,25,30,35,40,45,50,55 * * * * /usr/bin/test -x /opt/rudder/bin/check-rudder-agent \&\& /opt/rudder/bin/check-rudder-agent >> /var/log/rudder/agent-check/check.log 2>\&1"),
         classes       => rudder_common_classes("rudder_aix_crontab_insertion"),
         comment       => "Insert an AIX-compatible user crontab to run /opt/rudder/bin/rudder agent check";
 

diff --git a/techniques/system/common/1.0/promises.st b/techniques/system/common/1.0/promises.st
@@ -734,6 +734,7 @@ bundle agent garbage_collection
                                         "${sys.workdir}/promise_summary.log",
                                         "${sys.workdir}/cf_notkept.log",
                                         "${sys.workdir}/cf_repair.log",
+                                        "/var/log/rudder/agent-check/check.log",
                                      };
 
   files:
@@ -751,6 +752,8 @@ bundle agent garbage_collection
         file_select => days_old("&MODIFIED_FILES_TTL&"),
         depth_search => recurse("inf");
 
+      "/var/log/rudder/agent-check/." create => "true";
+
       "${log_files_to_rotate}"
         comment     => "Rotate file if above specified size",
         rename      => rotate("10"),

diff --git a/techniques/system/common/1.0/rudder-agent-community-cron b/techniques/system/common/1.0/rudder-agent-community-cron
@@ -5,4 +5,4 @@
 # To temporarily avoid this behaviour, run 'rudder agent disable'
 # Don't forget to remove that file when you're done!
 
-0,5,10,15,20,25,30,35,40,45,50,55 * * * * root /opt/rudder/bin/rudder agent check >/dev/null
+0,5,10,15,20,25,30,35,40,45,50,55 * * * * root /opt/rudder/bin/rudder agent check >> /var/log/rudder/agent-check/check.log 2>&1