add support for 'when = manual' (Closes: #511299)

diff --git a/AUTHORS b/AUTHORS
index 1d852cf57eeb11eb3640c84ff43f17a95e018f1e..dc0d2bd0c15cc91c5e929560a5642941ad535784 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,3 +28,4 @@ romain.tartiere@healthgrid.org -- ldap fixes
 Adam Monsen - spec file updates
 Matthew Palmer <mpalmer@debian.org> -- halt loglevel feature
 dan@garthwaite.org -- reportspace bugfix
+Tuomas Jormola <tj@solitudo.net> -- "when = manual" option

diff --git a/ChangeLog b/ChangeLog
index 87d32844e094b31ee5137ece26fec15fc606a8c9..58ae95470d48ae430d4fdcd24124b08a08b97785 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@ version 0.9.7 -- UNRELEASED
     backupninja changes
         . fix bug in reportspace, thanks Dan Garthwaite
         . do not assume English locale when using date (Closes: #465837)
+        . add 'when = manual' option, that can be used in the global config
+          file or in a given backup action file. Thanks Tuomas Jormola for the
+          preliminary patch (Closes: #511299)
     handler changes
        maildir:
         . fix location of deleted_on file

diff --git a/man/backup.d.5 b/man/backup.d.5
index 5090051e34afb4b632e5805ccdfab6ad7c9318ba..fd5c9b2adca5335f97939afa875d09c3ffa63ffb 100644 (file)
--- a/man/backup.d.5
+++ b/man/backup.d.5
@@ -67,7 +67,7 @@ Example templates for the action configuration files can be found in /usr/share/
 
 .SH SCHEDULING
 
-By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. 
+By default, each configuration file is processed everyday at 01:00 (1 AM). This can be changed by specifying the 'when' option in a backup action's config file or in the global configuration file. Special value 'manual' will disable scheduling for the backup action. It is possible to run the backup action manually by invoking \fBninjahelper(1)\fP with --run command line argument.
 
 For example:
   when = sundays at 02:00
@@ -76,6 +76,7 @@ For example:
   when = everyday at 01
   when = Tuesday at 05:00
   when = hourly
+  when = manual
 
 These values for "when" are invalid:
   when = tuesday at 2am

diff --git a/src/backupninja.in b/src/backupninja.in
index 6dee3b6163c4920a06e34f95c0e3ebe831277272..2a1b76ebae4c1d512a6a3f800a92a7e9573cc326 100755 (executable)
--- a/src/backupninja.in
+++ b/src/backupninja.in
@@ -208,6 +208,9 @@ nowdayofweek=`tolower "$nowdayofweek"`
 function isnow() {
        local when="$1"
        set -- $when
+
+       [ "$when" == "manual" ] && return 0
+
        whendayofweek=$1; at=$2; whentime=$3;
        whenday=`toint "$whendayofweek"`
        whendayofweek=`tolower "$whendayofweek"`
@@ -298,9 +301,9 @@ function process_action() {
                        ret=$?
                        IFS=$'\t\n'
                        if [ $ret == 0 ]; then
-                               debug "skipping $file because it is not $w"
+                               debug "skipping $file because current time does not match $w"
                        else
-                               info ">>>> starting action $file (because it is $w)"
+                               info ">>>> starting action $file (because current time matches $w)"
                                run="yes"
                        fi
                done