From 0280f0e9dbd736ce3e9a3d0bda950a7efff28181 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 9 Jul 2009 15:22:09 +0200 Subject: [PATCH] ccollect update Signed-off-by: Nico Schottelius --- software/ccollect/doc/ccollect.htm | 8 ++++---- software/ccollect/doc/ccollect.html | 8 ++++---- software/ccollect/doc/ccollect.text | 6 +++--- software/ccollect/doc/man/ccollect.1 | 4 ++-- software/ccollect/doc/man/ccollect.htm | 2 +- software/ccollect/doc/man/ccollect_add_source.1 | 4 ++-- software/ccollect/doc/man/ccollect_add_source.htm | 2 +- software/ccollect/doc/man/ccollect_analyse_logs.1 | 4 ++-- software/ccollect/doc/man/ccollect_analyse_logs.htm | 2 +- software/ccollect/doc/man/ccollect_delete_source.1 | 4 ++-- software/ccollect/doc/man/ccollect_delete_source.htm | 2 +- software/ccollect/doc/man/ccollect_list_intervals.1 | 4 ++-- software/ccollect/doc/man/ccollect_list_intervals.htm | 2 +- software/ccollect/doc/man/ccollect_logwrapper.1 | 4 ++-- software/ccollect/doc/man/ccollect_logwrapper.htm | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/software/ccollect/doc/ccollect.htm b/software/ccollect/doc/ccollect.htm index 331199ce..0a6c7f43 100644 --- a/software/ccollect/doc/ccollect.htm +++ b/software/ccollect/doc/ccollect.htm @@ -1,4 +1,4 @@ -ccollect - Installing, Configuring and Using

ccollect - Installing, Configuring and Using

Revision History
Revision 0.7.1for ccollect 0.7.1, Initial Version from 2006-01-13NS

(pseudo) incremental backup +ccollect - Installing, Configuring and Using

ccollect - Installing, Configuring and Using

Revision History
Revision 0.7.1for ccollect 0.7.1, Initial Version from 2006-01-13NS

(pseudo) incremental backup with different exclude lists using hardlinks and rsync

Introduction

ccollect is a backup utility written in the sh-scripting language. It does not depend on a specific shell, only /bin/sh needs to be @@ -207,7 +207,7 @@ explanation.

remote_host host to backup to

Example:

   [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l  conf/sources/testsource2
    insgesamt 12
-   lrwxrwxrwx  1 nico users   20 2005-11-17 16:44 destination -> /home/nico/backupdir
+   lrwxrwxrwx  1 nico users   20 2005-11-17 16:44 destination
    -rw-r--r--  1 nico users   62 2005-12-07 17:43 exclude
    drwxr-xr-x  2 nico users 4096 2005-12-07 17:38 intervals
    -rw-r--r--  1 nico users   15 2005-11-17 16:44 source
@@ -439,12 +439,12 @@ srwali01:/etc/ccollect/sources/local-root# ccollect.sh taeglich local-root
 srwali01:/etc/ccollect/sources# mkdir windos-wl6
 srwali01:/etc/ccollect/sources# cd windos-wl6/
 srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/win/SYS/WL6 > source
-srwali01:/etc/ccollect/sources/windos-wl6# ln -s /mnt/hdbackup/wl6 destination
+srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/hdbackup/wl6 > destination
 srwali01:/etc/ccollect/sources/windos-wl6# mkdir /mnt/hdbackup/wl6
 srwali01:/etc/ccollect/sources/windos-wl6# cd ..
 srwali01:/etc/ccollect/sources# mkdir windos-daten
 srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/win/Daten > source
-srwali01:/etc/ccollect/sources/windos-daten# ln -s /mnt/hdbackup/windos-daten destination
+srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/hdbackup/windos-daten > destination
 srwali01:/etc/ccollect/sources/windos-daten# mkdir /mnt/hdbackup/windos-daten
 
 # Now add some remote source
diff --git a/software/ccollect/doc/ccollect.html b/software/ccollect/doc/ccollect.html
index d83be18b..79fb5c7b 100644
--- a/software/ccollect/doc/ccollect.html
+++ b/software/ccollect/doc/ccollect.html
@@ -848,7 +848,7 @@ explanation.

   [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l  conf/sources/testsource2
    insgesamt 12
-   lrwxrwxrwx  1 nico users   20 2005-11-17 16:44 destination -> /home/nico/backupdir
+   lrwxrwxrwx  1 nico users   20 2005-11-17 16:44 destination
    -rw-r--r--  1 nico users   62 2005-12-07 17:43 exclude
    drwxr-xr-x  2 nico users 4096 2005-12-07 17:38 intervals
    -rw-r--r--  1 nico users   15 2005-11-17 16:44 source
@@ -1323,12 +1323,12 @@ srwali01:/etc/ccollect/sources/local-root# ccollect.sh taeglich local-root
 srwali01:/etc/ccollect/sources# mkdir windos-wl6
 srwali01:/etc/ccollect/sources# cd windos-wl6/
 srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/win/SYS/WL6 > source
-srwali01:/etc/ccollect/sources/windos-wl6# ln -s /mnt/hdbackup/wl6 destination
+srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/hdbackup/wl6 > destination
 srwali01:/etc/ccollect/sources/windos-wl6# mkdir /mnt/hdbackup/wl6
 srwali01:/etc/ccollect/sources/windos-wl6# cd ..
 srwali01:/etc/ccollect/sources# mkdir windos-daten
 srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/win/Daten > source
-srwali01:/etc/ccollect/sources/windos-daten# ln -s /mnt/hdbackup/windos-daten destination
+srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/hdbackup/windos-daten > destination
 srwali01:/etc/ccollect/sources/windos-daten# mkdir /mnt/hdbackup/windos-daten
 
 # Now add some remote source
@@ -1506,7 +1506,7 @@ rsync -av -H --delete /mnt/archiv/ "$DDIR/archiv/"
diff --git a/software/ccollect/doc/ccollect.text b/software/ccollect/doc/ccollect.text index 29d7784a..984cdcf8 100644 --- a/software/ccollect/doc/ccollect.text +++ b/software/ccollect/doc/ccollect.text @@ -365,7 +365,7 @@ Example: -------------------------------------------------------------------------------- [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2 insgesamt 12 - lrwxrwxrwx 1 nico users 20 2005-11-17 16:44 destination -> /home/nico/backupdir + lrwxrwxrwx 1 nico users 20 2005-11-17 16:44 destination -rw-r--r-- 1 nico users 62 2005-12-07 17:43 exclude drwxr-xr-x 2 nico users 4096 2005-12-07 17:38 intervals -rw-r--r-- 1 nico users 15 2005-11-17 16:44 source @@ -905,12 +905,12 @@ srwali01:~# cd /etc/ccollect/sources srwali01:/etc/ccollect/sources# mkdir windos-wl6 srwali01:/etc/ccollect/sources# cd windos-wl6/ srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/win/SYS/WL6 > source -srwali01:/etc/ccollect/sources/windos-wl6# ln -s /mnt/hdbackup/wl6 destination +srwali01:/etc/ccollect/sources/windos-wl6# echo /mnt/hdbackup/wl6 > destination srwali01:/etc/ccollect/sources/windos-wl6# mkdir /mnt/hdbackup/wl6 srwali01:/etc/ccollect/sources/windos-wl6# cd .. srwali01:/etc/ccollect/sources# mkdir windos-daten srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/win/Daten > source -srwali01:/etc/ccollect/sources/windos-daten# ln -s /mnt/hdbackup/windos-daten destination +srwali01:/etc/ccollect/sources/windos-daten# echo /mnt/hdbackup/windos-daten > destination srwali01:/etc/ccollect/sources/windos-daten# mkdir /mnt/hdbackup/windos-daten # Now add some remote source diff --git a/software/ccollect/doc/man/ccollect.1 b/software/ccollect/doc/man/ccollect.1 index 294f51c9..ac20efc1 100644 --- a/software/ccollect/doc/man/ccollect.1 +++ b/software/ccollect/doc/man/ccollect.1 @@ -2,12 +2,12 @@ .\" Title: ccollect .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.1 -.\" Date: 07/01/2009 +.\" Date: 07/08/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/software/ccollect/doc/man/ccollect.htm b/software/ccollect/doc/man/ccollect.htm index ca2931ed..60b1c750 100644 --- a/software/ccollect/doc/man/ccollect.htm +++ b/software/ccollect/doc/man/ccollect.htm @@ -1,4 +1,4 @@ -ccollect(1)

ccollect(1)


NAME

ccollect - (pseudo) incremental backup with different exclude lists using hardlinks and rsync

SYNOPSIS

ccollect.sh <interval name> [args] <sources to backup>

DESCRIPTION

ccollect is a backup utility written in the sh-scripting language. +ccollect(1)

ccollect(1)


NAME

ccollect - (pseudo) incremental backup with different exclude lists using hardlinks and rsync

SYNOPSIS

ccollect.sh <interval name> [args] <sources to backup>

DESCRIPTION

ccollect is a backup utility written in the sh-scripting language. It does not depend on a specific shell, only /bin/sh needs to be bourne shell compatibel (like dash, ksh, zsh, bash, …).

For more information refer to the manual titled "ccollect - Installing, Configuring and Using" (available as text (asciidoc), diff --git a/software/ccollect/doc/man/ccollect_add_source.1 b/software/ccollect/doc/man/ccollect_add_source.1 index 59ccc439..4271dedf 100644 --- a/software/ccollect/doc/man/ccollect_add_source.1 +++ b/software/ccollect/doc/man/ccollect_add_source.1 @@ -2,12 +2,12 @@ .\" Title: ccollect_add_source .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.1 -.\" Date: 07/01/2009 +.\" Date: 07/08/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_ADD_SOURCE" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_ADD_SOURCE" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/software/ccollect/doc/man/ccollect_add_source.htm b/software/ccollect/doc/man/ccollect_add_source.htm index 858f607b..2fbb486e 100644 --- a/software/ccollect/doc/man/ccollect_add_source.htm +++ b/software/ccollect/doc/man/ccollect_add_source.htm @@ -1,4 +1,4 @@ -ccollect_add_source(1)

ccollect_add_source(1)


NAME

ccollect_add_source - create new source for ccollect(1)

SYNOPSIS

ccollect_add_source.sh <hostnames to create sources for>

DESCRIPTION

ccollect_add_source.sh creates a new backup source for use with ccollect(1). +ccollect_add_source(1)

ccollect_add_source(1)


NAME

ccollect_add_source - create new source for ccollect(1)

SYNOPSIS

ccollect_add_source.sh <hostnames to create sources for>

DESCRIPTION

ccollect_add_source.sh creates a new backup source for use with ccollect(1). It copies the files from to the source directory with the hostname below $CCOLLECT_CONF/sources. It is designed to run on a backup server to create new directories for new hosts.

FILES

diff --git a/software/ccollect/doc/man/ccollect_analyse_logs.1 b/software/ccollect/doc/man/ccollect_analyse_logs.1 index a7d77358..0db5ead8 100644 --- a/software/ccollect/doc/man/ccollect_analyse_logs.1 +++ b/software/ccollect/doc/man/ccollect_analyse_logs.1 @@ -2,12 +2,12 @@ .\" Title: ccollect_analyse_logs .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.1 -.\" Date: 07/01/2009 +.\" Date: 07/08/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_ANALYSE_LOG" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_ANALYSE_LOG" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/software/ccollect/doc/man/ccollect_analyse_logs.htm b/software/ccollect/doc/man/ccollect_analyse_logs.htm index f00a8d1c..83b1d004 100644 --- a/software/ccollect/doc/man/ccollect_analyse_logs.htm +++ b/software/ccollect/doc/man/ccollect_analyse_logs.htm @@ -1,4 +1,4 @@ -ccollect_analyse_logs(1)

ccollect_analyse_logs(1)


NAME

ccollect_analyse_logs - analyse logs produced by ccollect(1)

SYNOPSIS

ccollect_analyse_logs.sh [iwe]

DESCRIPTION

ccollect_analyse_logs.sh reads the logfiles from stdin. You have to specify +ccollect_analyse_logs(1)

ccollect_analyse_logs(1)


NAME

ccollect_analyse_logs - analyse logs produced by ccollect(1)

SYNOPSIS

ccollect_analyse_logs.sh [iwe]

DESCRIPTION

ccollect_analyse_logs.sh reads the logfiles from stdin. You have to specify at least one of the three loglevels (*i*nformational, *w*arning, *e*rror). Any combination of them is allowed.

FILES

ccollect log files diff --git a/software/ccollect/doc/man/ccollect_delete_source.1 b/software/ccollect/doc/man/ccollect_delete_source.1 index f9f25120..d7ff3b10 100644 --- a/software/ccollect/doc/man/ccollect_delete_source.1 +++ b/software/ccollect/doc/man/ccollect_delete_source.1 @@ -2,12 +2,12 @@ .\" Title: ccollect_delete_source .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.1 -.\" Date: 07/01/2009 +.\" Date: 07/08/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_DELETE_SOUR" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_DELETE_SOUR" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/software/ccollect/doc/man/ccollect_delete_source.htm b/software/ccollect/doc/man/ccollect_delete_source.htm index f2deb1ce..fb30ac3b 100644 --- a/software/ccollect/doc/man/ccollect_delete_source.htm +++ b/software/ccollect/doc/man/ccollect_delete_source.htm @@ -1,4 +1,4 @@ -ccollect_delete_source(1)

ccollect_delete_source(1)


NAME

ccollect_delete_source - delete sources from ccollect(1)

SYNOPSIS

ccollect_delete_source.sh [-d] [-f] <hostnames to create sources for>

DESCRIPTION

ccollect_delete_source.sh deletes backup sources from ccollect(1) and optional +ccollect_delete_source(1)

ccollect_delete_source(1)


NAME

ccollect_delete_source - delete sources from ccollect(1)

SYNOPSIS

ccollect_delete_source.sh [-d] [-f] <hostnames to create sources for>

DESCRIPTION

ccollect_delete_source.sh deletes backup sources from ccollect(1) and optional also the backups created for that source.

OPTIONS

-d: Delete also the destination directory. add_ccollect_source.sh will change to the source/name/destination directory, get the absolute name and delete diff --git a/software/ccollect/doc/man/ccollect_list_intervals.1 b/software/ccollect/doc/man/ccollect_list_intervals.1 index eccd687c..f2e4f0e9 100644 --- a/software/ccollect/doc/man/ccollect_list_intervals.1 +++ b/software/ccollect/doc/man/ccollect_list_intervals.1 @@ -2,12 +2,12 @@ .\" Title: ccollect_list_intervals .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.1 -.\" Date: 07/01/2009 +.\" Date: 07/08/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_LIST_INTERV" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_LIST_INTERV" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/software/ccollect/doc/man/ccollect_list_intervals.htm b/software/ccollect/doc/man/ccollect_list_intervals.htm index c2fdd5fd..de779381 100644 --- a/software/ccollect/doc/man/ccollect_list_intervals.htm +++ b/software/ccollect/doc/man/ccollect_list_intervals.htm @@ -1,4 +1,4 @@ -ccollect_list_intervals(1)

ccollect_list_intervals(1)


NAME

ccollect_list_intervals - list available intervals from ccollect(1)

SYNOPSIS

ccollect_list_intervals.sh

DESCRIPTION

ccollect_list_intervals.sh shows intervals specified in the configuration +ccollect_list_intervals(1)

ccollect_list_intervals(1)


NAME

ccollect_list_intervals - list available intervals from ccollect(1)

SYNOPSIS

ccollect_list_intervals.sh

DESCRIPTION

ccollect_list_intervals.sh shows intervals specified in the configuration for ccollect(1). It displays the name of each interval, followed by a colon followed by the number backups to keep.

FILES

$CCOLLECT_CONF/intervals diff --git a/software/ccollect/doc/man/ccollect_logwrapper.1 b/software/ccollect/doc/man/ccollect_logwrapper.1 index 7a986480..642d6d70 100644 --- a/software/ccollect/doc/man/ccollect_logwrapper.1 +++ b/software/ccollect/doc/man/ccollect_logwrapper.1 @@ -2,12 +2,12 @@ .\" Title: ccollect_logwrapper .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.1 -.\" Date: 07/01/2009 +.\" Date: 07/08/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_LOGWRAPPER" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_LOGWRAPPER" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/software/ccollect/doc/man/ccollect_logwrapper.htm b/software/ccollect/doc/man/ccollect_logwrapper.htm index 484f4be1..b84dc98d 100644 --- a/software/ccollect/doc/man/ccollect_logwrapper.htm +++ b/software/ccollect/doc/man/ccollect_logwrapper.htm @@ -1,4 +1,4 @@ -ccollect_logwrapper(1)

ccollect_logwrapper(1)


NAME

ccollect_logwrapper - start ccollect(1) and create a unique logfile

SYNOPSIS

ccollect_logwrapper.sh <ccollect options>

DESCRIPTION

ccollect_logwrapper.sh creates a unique logfile below +ccollect_logwrapper(1)

ccollect_logwrapper(1)


NAME

ccollect_logwrapper - start ccollect(1) and create a unique logfile

SYNOPSIS

ccollect_logwrapper.sh <ccollect options>

DESCRIPTION

ccollect_logwrapper.sh creates a unique logfile below $CCOLLECT_CONF/logwrapper and redirects ccollect(1) output (stdout and stderr) to it.

OPTIONS

Options are passed directly to ccollect(1).

FILES

$CCOLLECT_CONF/logwrapper