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

582 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nico Schottelius
ab74059c77 Documentate changes from 0.7 to 0.8 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 08:46:22 +02:00
Nico Schottelius
aeb3ff6d89 john also introduced default option support 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 08:42:25 +02:00
Nico Schottelius
852155a4db Update changes list: +6 changes 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-29 08:33:59 +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
ba11374c6f DOC: cosmetic changes 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:09:56 +02:00
Nico Schottelius
4b560f64f4 Test: include removal of incomplete backups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:09:34 +02:00
Nico Schottelius
50dcd80b85 add source, which deletes incomplete backups 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 17:05:04 +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
8a56d41ebc very-verbose -> very_verbose 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:46:05 +02:00
Nico Schottelius
87e15be561 update example sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-28 07:45:13 +02:00
Nico Schottelius
77ea2b513f update example sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 20:39:09 +02:00
Nico Schottelius
4e3c5922ee add smaller tests - easier to detect the problem 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-27 20:38:55 +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
1b1e0ebc8b update example sources 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 09:00:48 +02:00
Nico Schottelius
e136b132e6 update changes list 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 08:59:13 +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
e390c62072 run all sources as a test 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-24 08:57:53 +02:00
Nico Schottelius
ef641b5e31 update ccollect vs. rsnapshot LOC statistic 
Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 19:42:56 +02:00
Nico Schottelius
c9472c5dff add luckys patches 
idea looks good, patches need some claenups

Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org>
 2009-07-23 18:55:25 +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