skybeam/ccollect
1
0
Fork 0
forked from ungleich-public/ccollect
Code Issues Pull requests Projects Releases Wiki Activity
713 commits 4 branches 35 tags 790 KiB
Commit graph

713 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Patrick Drolet
3d92f30574 Add ccollect_mgr.sh, rdu and S60ccollect_example (initscript for ccollect) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 10:30:30 +01:00
Nico Schottelius
67aead1db2 more changes for the next release 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 10:19:44 +01:00
Patrick Drolet
4af94d9e71 traps more errors and warnings. 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-30 10:18:58 +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
1c8a0808a6 and more stuff for the next release 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 19:37:36 +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
e8a977720f one more bugfix for the next release 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:44:16 +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
9d94beec68 more changes for the next version 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:27:11 +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
9eba4e8b8e update destination directory 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-25 15:21:19 +01:00
Nico Schottelius
5d41dea79d update manpage of ccollect: update argument order 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-10-12 08:04:22 +02:00
Nikita Koshikov
93b56025fa Add ccollect rpm spec 
Thanks a lot, Nikita!
 2009-09-10 12:48:28 +02:00
Nico Schottelius
59f880ea86 [DOC] fix typo 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-21 13:06:01 +02:00
Nico Schottelius
1f84f87888 changes for the next version 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-21 13:05:49 +02: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
f17023255c begin to write a test for the whole ccollect tools 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-20 10:09:07 +02:00
Nico Schottelius
0f7a6a88ef [BUGFIX (untested)] fix current directory removal 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-20 09:49:47 +02:00
Nico Schottelius
b749a05473 a bugfix into the next release 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-20 09:46:38 +02:00
Nico Schottelius
a08580fe7e add tool to archive the configuration 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-16 13:39:39 +02:00
Nico Schottelius
3abea41ffa Copy the correct COPYING file (replaced wrong LGPL3 with GPL3) 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-08-03 12:22:39 +02:00
Nico Schottelius
56879ed9fb even more changes 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 09:24:50 +02:00
Nico Schottelius
cf1459251e specifiy, which options can be used as defaults 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 09:22:42 +02:00
Nico Schottelius
48e181674a Documentation updates and introduce new section 'Default options' 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 09:16:51 +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
3231acf525 config: add default option and disable it for one source 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 09:08:38 +02:00
Nico Schottelius
3431646fba update document version to 0.8 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 08:49:05 +02:00