projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added enhanced options to ldap handler
[matthijs/upstream/backupninja-vserver.git]
/
backupninja
diff --git
a/backupninja
b/backupninja
index 3943724d3449c0ef12b02eaaf9fd7553c2522ac1..380ffcc37f0e1afd7f7ae8edada2f63fcb46b045 100755
(executable)
--- a/
backupninja
+++ b/
backupninja
@@
-199,9
+199,9
@@
function isnow() {
whendayofweek=$1; at=$2; whentime=$3;
whenday=`toint "$whendayofweek"`
whendayofweek=`tolower "$whendayofweek"`
whendayofweek=$1; at=$2; whentime=$3;
whenday=`toint "$whendayofweek"`
whendayofweek=`tolower "$whendayofweek"`
- whentime=`echo "$whentime" | sed 's/:[0-9][0-9]$//'`
+ whentime=`echo "$whentime" | sed 's/:[0-9][0-9]$//'
| sed -r 's/^([0-9])$/0\1/'
`
- if [ "$whendayofweek" == "everyday" ]; then
+ if [ "$whendayofweek" == "everyday"
-o "$whendayofweek" == "daily"
]; then
whendayofweek=$nowdayofweek
fi
whendayofweek=$nowdayofweek
fi
@@
-402,6
+402,7
@@
defaultwhen=$when
getconf logfile /var/log/backupninja.log
getconf usecolors "yes"
getconf SLAPCAT /usr/sbin/slapcat
getconf logfile /var/log/backupninja.log
getconf usecolors "yes"
getconf SLAPCAT /usr/sbin/slapcat
+getconf LDAPSEARCH /usr/bin/ldapsearch
getconf RDIFFBACKUP /usr/bin/rdiff-backup
getconf MYSQL /usr/bin/mysql
getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy
getconf RDIFFBACKUP /usr/bin/rdiff-backup
getconf MYSQL /usr/bin/mysql
getconf MYSQLHOTCOPY /usr/bin/mysqlhotcopy