saz/ccollect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
616 commits 4 branches 33 tags 636 KiB
Commit graph

243 commits

Author SHA1 Message Date
Nico Schottelius
c314f284a2 export destination_* for usage in post_exec in documentate it 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 10:18:23 +01:00
Nico Schottelius
e6d89d57fc Fix Patricks patch: remove comments, remove if..then, add quotes for $@, do not add destination_full for post_exec 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 10:01:11 +01:00
Patrick Drolet
e4dea56e49 Begin to replace false verbose handling 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 09:52:33 +01:00
Nico Schottelius
59c8941373 cleanup destination setting :-) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 09:15:53 +01:00
Nico Schottelius
9e801582d5 use -d to prevent displaying the content of a directory 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 09:03:58 +01:00
Nico Schottelius
435f2140da cleanly set suffix 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 08:14:59 +01:00
Nico Schottelius
145c6de2fb double check quotes, remove grep 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 07:40:55 +01:00
Nico Schottelius
1b591a040c -p is not needed, when matching directories with */ 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-31 07:31:23 +01:00
Nico Schottelius
2a6ab4c125 adjust ls for existing backups to new delete_from_file behaviour 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 19:49:17 +01:00
Nico Schottelius
39e8eb4c94 fix incomplete output message 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 19:45:03 +01:00
Nico Schottelius
9d65e1b1bf remove now obsolete code :-) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 19:43:21 +01:00
Nico Schottelius
ef4291c722 use delete_from_file with suffix 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 19:42:32 +01:00
Nico Schottelius
086af1497c need to unset $@ completly in delete_from_file() 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 19:42:13 +01:00
Nico Schottelius
8a70e30d97 cleanup delete_from_file(): clean suffix stuff 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 19:26:32 +01:00
Nico Schottelius
4865f3c8c6 extend delete_from_file() to allow removal of suffix files 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 19:25:23 +01:00
Nico Schottelius
84c732bfc0 now put the dot back into CMARKER 
Removed it some hundred commits before

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 20:15:14 +01:00
Nico Schottelius
ce6157efee begin to cleanup ugly awk line 
Using ENVIRON[] instead of ugly quoting

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 20:13:50 +01:00
Nico Schottelius
08331387b7 +braces 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 20:05:50 +01:00
Nico Schottelius
262ceabca3 shorten some lines 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 19:53:26 +01:00
Nico Schottelius
3d571e915a add braces 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 19:50:04 +01:00
Nico Schottelius
d7c4834dce move c_marker to the global section, it's not specfic to a source 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 19:34:13 +01:00
Nico Schottelius
229e251482 report about whole path, not the backup name 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:40:57 +01:00
Nico Schottelius
422b220494 more smaller cleanups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:40:37 +01:00
Nico Schottelius
36f413173a minor argument reordering - beautify 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:30:55 +01:00
Nico Schottelius
23b2fcee08 move -* check at the right location 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:26:17 +01:00
Nico Schottelius
25d8a2e2fb remove double --help section 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:24:18 +01:00
Nico Schottelius
f549334226 Add rsync arguments for source checking 
Fix proposed by Nikita Koshikov:

--------------------------------------------------------------------------------
[...]

[guard] + set -- --archive --delete --numeric-ids --relative --delete-excluded --sparse --stats -v
[guard] + '[' -f /etc/ccollect/sources/guard/rsync_options ']'
[guard] + read line
[guard] + set -- --archive --delete --numeric-ids --relative --delete-excluded --sparse --stats -v
--password-file=/etc/ccollect/passwd
[guard] + read line
[guard] + rsync backup@192.168.1.8::etc
Password:

In this place it's sit and waiting for password. If I comment out related ccollect code section everything
start working as expected. I had to modify this part to be look like:

if ! rsync "${source}" "$@" >/dev/null 2>"${TMP}" ; then
    if [ ! -f "${c_quiet_if_down}" ]; then
       cat "${TMP}"
    fi
    _exit_err "Source ${source} is not readable. Skipping."
fi

Then checking host activity is passed and backup process running successful.

--------------------------------------------------------------------------------

Changed it to "$@" "$source" instead, to be consistent and use options
before source.

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-21 13:03:38 +02:00
Nico Schottelius
26f4ae777b prepare release 0.8 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-20 17:36:09 +02:00
Nico Schottelius
8cc833a7b1 only change mtime of main dir, if sorting by mtime is selected 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-20 16:25:25 +02:00
Nico Schottelius
02670a813c synchronise order of options in ccollect with documentation 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 09:10:30 +02:00
Nico Schottelius
4696590a73 Create SDATE, similar to DDATE and CDATE 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:16:13 +02:00
Nico Schottelius
4ba0dab260 Create function 'delete_from_file()' 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 12:43:23 +02:00
Nico Schottelius
e6a0300b9b Simplify removal code 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:47:48 +02:00
Nico Schottelius
9aa111d21b export TMP to subscripts 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:46:43 +02:00
Nico Schottelius
428670b4e7 comment cleanups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:52:18 +02:00
Nico Schottelius
c2bc225dc0 SORT: make it more explicit, which sorting options are used 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:39:33 +02:00
Nico Schottelius
483cfee90c Reorder: All checks being done in the same place 
All configurations are checked in the same place

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:37:50 +02:00
Nico Schottelius
cbf1b7cf0e Simplify error printing, if quiet_if_down is set 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:17:06 +02:00
Nico Schottelius
b014c00d24 Remove double code imported with merge 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:16:35 +02:00
Nico Schottelius
d61c9625f4 Only check configuration options, if the base is exitsing 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:06:01 +02:00
Nico Schottelius
65c34deb43 remove unecessary whitespace in line 204 :-) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 09:01:13 +02:00
Nico Schottelius
2b890b0316 Merge commit 'john/updates' 
Fixed alot of conflicts due to parallel work, but it looks very good now!

Conflicts:
	ccollect.sh
 2009-07-24 09:09:16 +02:00
Nico Schottelius
b44fdb6107 some cleanups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 08:58:48 +02:00
Nico Schottelius
ed30a4d25b Remove check for directories with -a 
Type of source is checked later anyway and using
ls -p1 results in "dir/", which we should cleanup
with "sed 's;/$;;' again, which is ugly.

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:56:41 +02:00
Nico Schottelius
8a87e7effa Move option check below the check for existence of source 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:53:35 +02:00
Nico Schottelius
f5e1920a15 join source handling for --all and normal 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:47:54 +02:00
Nico Schottelius
8491a54b0d extract the interval handling from parsing 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:46:04 +02:00
Nico Schottelius
debdd9d004 BUGFIX: Fix --all handling 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:39:42 +02:00
Nico Schottelius
37dcda8e3b BUGFIX: ignore -- as parameter 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 17:37:55 +02:00
Nico Schottelius
5da5506c65 add quotes to every possible problematic variable, add braces 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-01 22:39:42 +02:00