[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-69-g53033af

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 53033af17218273b4782d41913cb7ef81038add3
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Feb 21 21:17:03 2013 +0100

    use sharedir substitution in crontabs
    
    stop using $HOME
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/conf/crontab-master.in b/conf/crontab-master.in
index cf2628d..7d9e82d 100644
--- a/conf/crontab-master.in
+++ b/conf/crontab-master.in
@@ -3,32 +3,31 @@
 #
 # cleanup $HTDOCS/daily.lock
 #
- at reboot $HOME/bin/master_cleanup
+ at reboot @sharedir@/piuparts/master/master_cleanup
 
 #
 # create reports once a day
 #  (dinstall runs 1|7|13|19:52, so this is long after mirror pushes...)
 #
-0 0 * * * $HOME/bin/generate_daily_report
+0  0 * * * @sharedir@/piuparts/master/generate_daily_report
 
 #
 # reschedule old logs twice a day
 #
-00 3,15 * * * $HOME/bin/reschedule_oldest_logs
+00 3,15 * * * @sharedir@/piuparts/master/reschedule_oldest_logs
 
 #
 # monitor for problems once a day
 # - these may result in packages being retested
-# - if that's not the case, run them from within ~/bin/generate_daily_report
+# - if that's not the case, run them from within generate_daily_report
 #
-30 21 * * * $HOME/bin/detect_network_issues
-45 21 * * * $HOME/bin/detect_piuparts_issues
-0  22 * * * $HOME/bin/detect_archive_issues
-30 22 * * * $HOME/bin/report_untestable_packages
-0  23 * * * $HOME/bin/report_stale_reserved_packages
+30 21 * * * @sharedir@/piuparts/master/detect_network_issues
+45 21 * * * @sharedir@/piuparts/master/detect_piuparts_issues
+0  22 * * * @sharedir@/piuparts/master/detect_archive_issues
+30 22 * * * @sharedir@/piuparts/master/report_untestable_packages
+0  23 * * * @sharedir@/piuparts/master/report_stale_reserved_packages
 
 #
 # misc
 #
-0 2 * * * $HOME/bin/prepare_backup
-
+0  2 * * * @sharedir@/piuparts/master/prepare_backup
diff --git a/conf/crontab-slave.in b/conf/crontab-slave.in
index ed113c5..6422372 100644
--- a/conf/crontab-slave.in
+++ b/conf/crontab-slave.in
@@ -3,19 +3,19 @@
 #
 # start slave_run automatically after reboots
 #
- at reboot $HOME/bin/slave_cleanup ; sudo $HOME/bin/slave_run
+ at reboot @sharedir@/piuparts/slave/slave_cleanup ; sudo @sharedir@/piuparts/slave/slave_run
 
 #
 # monitor slave session every hour
 #
-16 * * * * $HOME/bin/detect_slave_problems
+16 * * * * @sharedir@/piuparts/slave/detect_slave_problems
 
 #
 # monitor for problems every six hours
 #
-23 */6 * * * $HOME/bin/detect_leftover_processes
+23 */6 * * * @sharedir@/piuparts/slave/detect_leftover_processes
 
 #
 # monitor for cruft in the temporary directory once a day
 #
-00  0 * * * $HOME/bin/detect_tmp_cruft
+00  0 * * * @sharedir@/piuparts/slave/detect_tmp_cruft
diff --git a/debian/changelog b/debian/changelog
index 4ffab90..3b8fa6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ piuparts (0.50) UNRELEASED; urgency=low
     is used by all master/slave shell scripts. Shipped in piuparts.common.
     - Add support for RFC822 line continuation (wrap + indent) and comments.
   * master-bin/slave-bin: Switch to sourcing read_config.sh.
+  * conf/crontab*: Substitute @sharedir@ at build time.
   * pre_install_exceptions: Handle bootcd-ia64 installation in squeeze.
   * post_distupgrade_exceptions: Handle libdb4.8 removal in wheezy.
   * pre_remove_50_find_bad_permissions: Add some exceptions.

-- 
piuparts git repository