LP#1468096 - updates for the example crontab file.

Updated action trigger config so it works by default.

Removed prefix that sourced the .bashrc, since it exits when not
run interactively by default.

Signed-off-by: Josh Stompro <stomproj@larl.org>

diff --git a/Open-ILS/examples/crontab.example b/Open-ILS/examples/crontab.example
index 1060f77..ee790e9 100644 (file)
--- a/Open-ILS/examples/crontab.example
+++ b/Open-ILS/examples/crontab.example
@@ -31,53 +31,48 @@ EG_BIN_DIR = /openils/bin
 # m h dom mon dow   command
 
 # Run the hold targeter
-*/15 * * * *   . ~/.bashrc && $EG_BIN_DIR/hold_targeter.pl $SRF_CORE
+*/15 * * * * $EG_BIN_DIR/hold_targeter.pl $SRF_CORE
 
 # Run the hold thawer
-5  0  * * *   . ~/.bashrc && $EG_BIN_DIR/thaw_expired_frozen_holds.srfsh
+5  0  * * * $EG_BIN_DIR/thaw_expired_frozen_holds.srfsh
 
 # Generate fines
-30 0  * * *   . ~/.bashrc && $EG_BIN_DIR/fine_generator.pl $SRF_CORE
+30 0  * * * $EG_BIN_DIR/fine_generator.pl $SRF_CORE
 
 # Run the reshelving completer
-2  0  * * *   . ~/.bashrc && $EG_BIN_DIR/reshelving_complete.srfsh
+2  0  * * * $EG_BIN_DIR/reshelving_complete.srfsh
 
 # Run the pending user purger
-30 2  * * *   . ~/.bashrc && $EG_BIN_DIR/purge_pending_users.srfsh
+30 2  * * * $EG_BIN_DIR/purge_pending_users.srfsh
 
 # create the list of blocked patrons for offline use
 # Note: The resulting list.txt file needs to be copied to all Apache servers
-30 6  * * *   . ~/.bashrc && $EG_BIN_DIR/offline-blocked-list.pl $SRF_CORE > $OPENILS/var/web/standalone/list.txt
+30 6  * * * $EG_BIN_DIR/offline-blocked-list.pl $SRF_CORE > $OPENILS/var/web/standalone/list.txt
 
 # Restart SIP nightly to free up any orphaned processes.  
 # Note: Run on all SIP servers
-# 5  2  * * *   . ~/.bashrc && oils_ctl.sh -d $OPENILS/var/pid -s $OPENILS/conf/oils_sip.xml -a stop_sip
-# 8  2  * * *   . ~/.bashrc && oils_ctl.sh -d $OPENILS/var/pid -s $OPENILS/conf/oils_sip.xml -a start_sip
+# 5  2  * * * oils_ctl.sh -d $OPENILS/var/pid -s $OPENILS/conf/oils_sip.xml -a stop_sip
+# 8  2  * * * oils_ctl.sh -d $OPENILS/var/pid -s $OPENILS/conf/oils_sip.xml -a start_sip
 
 # Run the circ history cleanup job
 # Note: destroys link between user and item
-#2  0  * * *   . ~/.bashrc && $EG_BIN_DIR/clear_expired_circ_history.srfsh
+#2  0  * * * $EG_BIN_DIR/clear_expired_circ_history.srfsh
 
 # Run the hard due date updater
-2  3  * * *   . ~/.bashrc && $EG_BIN_DIR/update_hard_due_dates.srfsh
+2  3  * * * $EG_BIN_DIR/update_hard_due_dates.srfsh
 
 # Action/Trigger entries ----
 
 # Runs all pending A/T events every half hour
-*/30 * * * * . ~/.bashrc && $EG_BIN_DIR/action_trigger_runner.pl --osrf-config $SRF_CORE --run-pending
-
-# Passive A/T event generation.
-# Note: push these back to 3am so they will run after the fine generator and spread out the start minute to reduce dogpiling
-0 * * * *   . ~/.bashrc && $EG_BIN_DIR/action_trigger_runner.pl --osrf-config $SRF_CORE --process-hooks --granularity hourly
-5 3 * * *   . ~/.bashrc && $EG_BIN_DIR/action_trigger_runner.pl --osrf-config $SRF_CORE --process-hooks --granularity daily
-10 3 * * 1-5 . ~/.bashrc && $EG_BIN_DIR/action_trigger_runner.pl --osrf-config $SRF_CORE --process-hooks --granularity weekdays
-15 3 * * 0   . ~/.bashrc && $EG_BIN_DIR/action_trigger_runner.pl --osrf-config $SRF_CORE --process-hooks --granularity weekly
-20 3 1 * *   . ~/.bashrc && $EG_BIN_DIR/action_trigger_runner.pl --osrf-config $SRF_CORE --process-hooks --granularity monthly
-25 3 1 1 *   . ~/.bashrc && $EG_BIN_DIR/action_trigger_runner.pl --osrf-config $SRF_CORE --process-hooks --granularity yearly
-
-# Legacy overdue/predue notice generator.  Change to suit.
-#XML_FILE_PREFIX = /openils/var/data/overdue/overdue
-#0 3 * * * . ~/.bashrc && cd $EG_BIN_DIR && ./generate_circ_notices.pl --osrf_config $SRF_CORE --notice-types overdue,predue --generate-global-templates --send-email > $XML_FILE_PREFIX.$(date +"\%F").xml
-
-# TODO: add other entries
-
+*/30 * * * * $EG_BIN_DIR/action_trigger_runner.pl --run-pending --process-hooks
+
+# Passive A/T event generation and --run-pending.
+0 * * * *    $EG_BIN_DIR/action_trigger_runner.pl --granularity hourly   --process-hooks --run-pending
+5 3 * * *    $EG_BIN_DIR/action_trigger_runner.pl --granularity daily    --process-hooks --run-pending
+10 3 * * 1-5 $EG_BIN_DIR/action_trigger_runner.pl --granularity weekdays --process-hooks --run-pending
+15 3 * * 0   $EG_BIN_DIR/action_trigger_runner.pl --granularity weekly   --process-hooks --run-pending
+20 3 1 * *   $EG_BIN_DIR/action_trigger_runner.pl --granularity monthly  --process-hooks --run-pending
+25 3 1 1 *   $EG_BIN_DIR/action_trigger_runner.pl --granularity yearly   --process-hooks --run-pending
+
+# Sitemap Generator - added in 2.7
+# 12 2 * * * cd $OPENILS/var/web && $EG_BIN_DIR/sitemap_generator --lib-hostname http://catalog.example.org