From f8df958524530bc6eb1f3a3b34b7dae56dd050a4 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Tue, 30 Mar 2010 18:47:12 +0200 Subject: [PATCH] ikiwiki setup updated Signed-off-by: Nico Schottelius --- ikiwiki.setup | 6 ++ software/ccollect/doc/ccollect.htm | 47 +++++++--- software/ccollect/doc/ccollect.html | 90 +++++++++++++++---- software/ccollect/doc/ccollect.text | 45 +++++++--- software/ccollect/doc/man/ccollect.1 | 13 ++- software/ccollect/doc/man/ccollect.htm | 8 +- software/ccollect/doc/man/ccollect.html | 14 ++- software/ccollect/doc/man/ccollect.text | 7 +- .../ccollect/doc/man/ccollect_add_source.1 | 4 +- .../ccollect/doc/man/ccollect_add_source.htm | 2 +- .../ccollect/doc/man/ccollect_analyse_logs.1 | 4 +- .../doc/man/ccollect_analyse_logs.htm | 2 +- .../ccollect/doc/man/ccollect_delete_source.1 | 4 +- .../doc/man/ccollect_delete_source.htm | 2 +- .../doc/man/ccollect_list_intervals.1 | 4 +- .../doc/man/ccollect_list_intervals.htm | 2 +- .../ccollect/doc/man/ccollect_logwrapper.1 | 4 +- .../ccollect/doc/man/ccollect_logwrapper.htm | 2 +- 18 files changed, 194 insertions(+), 66 deletions(-) diff --git a/ikiwiki.setup b/ikiwiki.setup index 496689a0..6eabb836 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -279,4 +279,10 @@ use IkiWiki::Setup::Standard { #add_underlays => [qw{/home/users/nico/wiki.underlay}], # extra template directories to add #add_templates => [qw{/home/users/nico/.ikiwiki/templates}], + + git_wrapper => '/home/services/git/netzseiten/www.nico.schottelius.org/hooks/post-update', + git_wrappermode => '06755', + gitorigin_branch => 'origin', + gitmaster_branch => 'master', + } diff --git a/software/ccollect/doc/ccollect.htm b/software/ccollect/doc/ccollect.htm index 3b1a6ff3..00447397 100644 --- a/software/ccollect/doc/ccollect.htm +++ b/software/ccollect/doc/ccollect.htm @@ -1,13 +1,13 @@ -ccollect - Installing, Configuring and Using

ccollect - Installing, Configuring and Using

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

Table of Contents

Introduction
Supported and tested operating systems and architectures
Why you COULD only backup from remote hosts, not to them
Incompatibilities and changes
Quick start
Requirements
Installing ccollect
Using ccollect
Installing
Configuring
Runtime options
General configuration
Source configuration
Hints
Smart logging
Using a different ssh port
Using source names or interval in pre_/post_exec scripts
Using rsync protocol without ssh
Not excluding top-level directories
Re-using already created rsync-backups
Using pre_/post_exec
Using source specific interval definitions
Comparing backups
Testing for host reachabilty
Easy check for errors
F.A.Q.
What happens if one backup is broken or empty?
When backing up from localhost the destination is also included. Is this a bug?
Why does ccollect say "Permission denied" with my pre-/postexec script?
Why does the backup job fail when part of the source is a link?
How can I prevent missing the right time to enter my password?
Examples
A backup host configuration from scratch
Using hard-links requires less disk space
A collection of backups on the backup server
Processes running when doing ccollect -p

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

ccollect - Installing, Configuring and Using

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

Table of Contents

Introduction
Supported and tested operating systems and architectures
Why you COULD only backup from remote hosts, not to them
Incompatibilities and changes
Quick start
Requirements
Installing ccollect
Using ccollect
Installing
Configuring
Runtime options
General configuration
Source configuration
Hints
Smart logging
Using a different ssh port
Using source names or interval in pre_/post_exec scripts
Using rsync protocol without ssh
Not excluding top-level directories
Re-using already created rsync-backups
Using pre_/post_exec
Using source specific interval definitions
Comparing backups
Testing for host reachabilty
Easy check for errors
F.A.Q.
What happens if one backup is broken or empty?
When backing up from localhost the destination is also included. Is this a bug?
Why does ccollect say "Permission denied" with my pre-/postexec script?
Why does the backup job fail when part of the source is a link?
How can I prevent missing the right time to enter my password?
Examples
A backup host configuration from scratch
Using hard-links requires less disk space
A collection of backups on the backup server
Processes running when doing ccollect -p

(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 bourne shell compatible (like dash, ksh, zsh, bash, …).

Supported and tested operating systems and architectures

ccollect was successfully tested on the following platforms:

  • -GNU/Linux on amd64/hppa/i386/ppc/ARM -
  • FreeBSD on amd64/i386
  • -Mac OS X 10.5 +GNU/Linux on amd64/arm/hppa/i386/ppc +
  • +Mac OS X 10.5
  • NetBSD on alpha/amd64/i386/sparc/sparc64
  • @@ -74,7 +74,7 @@ ccollect now reports when postexec returns non-zero config-pre-0.4-to-0.4.sh, which can be found in the tools/ subdirectory:

    [10:05] hydrogenium:ccollect-0.4# ./tools/config-pre-0.4-to-0.4.sh /etc/ccollect

Quick start

For those who do not want to read the whole long document:

# get latest ccollect tarball from http://www.nico.schottelius.org/software/ccollect/
 # replace value for CCV with the current version
-export CCV=0.8
+export CCV=0.8.1
 
 #
 # replace 'wget' with 'fetch' on bsd
@@ -160,8 +160,10 @@ following scripts to a directory in $PATH:
    tools/ccollect_logwrapper.sh
 
After having installed and used ccollect, report success using
 ./tools/report_success.sh.

Configuring

For configuration aid have a look at the above mentioned tools, which can assist -you quite well. When you are successfully using ccollect, report success using -tools/report_success.sh.

Runtime options

ccollect looks for its configuration in /etc/ccollect or, if set, in +you quite well. When you are successfully using ccollect, I would be happy if +you add a link to your website, stating "I backup with ccollect", which points +to the ccollect homepage. So more people now about ccollect, use it and +improve it. You can also report success using tools/report_success.sh.

Runtime options

ccollect looks for its configuration in /etc/ccollect or, if set, in the directory specified by the variable $CCOLLECT_CONF:

# sh-compatible (dash, zsh, mksh, ksh, bash, ...)
 $ CCOLLECT_CONF=/your/config/dir ccollect.sh ...
 
@@ -188,7 +190,14 @@ This number defines how many versions of this interval are kept.
Example:<
    4

This means to keep 28 daily backups, 12 monthly backups and 4 weekly.

General pre- and post-execution

If you add $CCOLLECT_CONF/defaults/pre_exec or /etc/ccollect/defaults/pre_exec (same with post_exec), ccollect will start pre_exec before the whole backup process and -post_exec after backup of all sources is done.

The following example describes how to report free disk space in +post_exec after backup of all sources is done.

If pre_exec exits with a non-zero return code, the whole backup +process will be aborted.

The pre_exec and post_exec script can access the following exported variables:

  • +INTERVAL: the interval selected (daily) +
  • +no_sources: number of sources to backup (2) +
  • +source_$no: name of the source, $no starts at 0 ($source_0) +

The following example describes how to report free disk space in human readable format before and after the whole backup process:

[13:00] hydrogenium:~# mkdir -p /etc/ccollect/defaults/
 [13:00] hydrogenium:~# echo '#!/bin/sh' >  /etc/ccollect/defaults/pre_exec
 [13:01] hydrogenium:~# echo ''          >> /etc/ccollect/defaults/pre_exec
@@ -316,7 +325,17 @@ to use for automatic backup over the rsync-protocol.
Example:
ccollect will execute this command before and
 respectively after doing the backup for this specific source.
 If you want to have pre-/post-exec before and after all
-backups, see above for general configuration.
Example:
[13:09] hydrogenium:ccollect-0.3% cat conf/sources/with_exec/pre_exec
+backups, see above for general configuration.
If pre_exec exits with a non-zero return code, the backup
+process of this source will be aborted (i.e. backup skipped).
The post_exec script can access the following exported variables from
+ccollect:
  • 
+name: name of the source that is being backed up
+
  • 
+destination_name: contains the base directory name (daily.20091031-1013.24496)
+
  • 
+destination_dir: full path (/tmp/ccollect/daily.20091031-1013.24496)
+
  • 
+destination_full: like destination_dir, but prepended with the remote_host, if set (host:/tmp/ccollect/daily.20091031-1013.24496 or /tmp/ccollect/daily.20091031-1013.24496)
+
Example:
[13:09] hydrogenium:ccollect-0.3% cat conf/sources/with_exec/pre_exec
 #!/bin/sh
 
 # Show whats free before
@@ -362,14 +381,16 @@ Host bruehe
    Hostname bruehe.schottelius.org
    Port 22
    HostKeyAlias bruehe.schottelius.org

Using source names or interval in pre_/post_exec scripts

The pre-/post_exec scripts can access some internal variables from ccollect:

  • -INTERVAL: The interval specified on the command line +INTERVAL: The interval specified on the command line
  • -no_sources: number of sources +no_sources: number of sources
  • -source_$NUM: the name of the source +source_$NUM: the name of the source
  • -name: the name of the currently being backuped source (not available for +name: the name of the currently being backuped source (not available for generic pre_exec script) +

Only available for post_exec:

  • +remote_host: name of host we backup to (empty if unused)

Using rsync protocol without ssh

When you have a computer with little computing power, it may be useful to use rsync without ssh, directly using the rsync protocol (specify user@host::share in source). You may wish to use diff --git a/software/ccollect/doc/ccollect.html b/software/ccollect/doc/ccollect.html index 02a06a16..760526ea 100644 --- a/software/ccollect/doc/ccollect.html +++ b/software/ccollect/doc/ccollect.html @@ -387,8 +387,8 @@ div#toc a:visited { color: blue; }

ccollect - Installing, Configuring and Using

Nico Schottelius
<nico-ccollect__@__schottelius.org>
-version 0.8, -for ccollect 0.8, Initial Version from 2006-01-13 +version 0.8.1, +for ccollect 0.8.1, Initial Version from 2006-01-13
@@ -407,17 +407,17 @@ bourne shell compatible (like dash, ksh, zsh, bas

  • -GNU/Linux on amd64/hppa/i386/ppc/ARM -

    -
    • -
  • -

    FreeBSD on amd64/i386

  • -Mac OS X 10.5 +GNU/Linux on amd64/arm/hppa/i386/ppc +

    +
    • +
  • +

    +Mac OS X 10.5

  • @@ -606,7 +606,7 @@ subdirectory:

# get latest ccollect tarball from http://www.nico.schottelius.org/software/ccollect/
 # replace value for CCV with the current version
-export CCV=0.8
+export CCV=0.8.1
 
 #
 # replace 'wget' with 'fetch' on bsd
@@ -751,8 +751,10 @@ following scripts to a directory in $PATH:

5. Configuring

For configuration aid have a look at the above mentioned tools, which can assist -you quite well. When you are successfully using ccollect, report success using -tools/report_success.sh.

+you quite well. When you are successfully using ccollect, I would be happy if +you add a link to your website, stating "I backup with ccollect", which points +to the ccollect homepage. So more people now about ccollect, use it and +improve it. You can also report success using tools/report_success.sh.

5.1. Runtime options

ccollect looks for its configuration in /etc/ccollect or, if set, in the directory specified by the variable $CCOLLECT_CONF:

@@ -803,6 +805,26 @@ This number defines how many versions of this interval are kept.

/etc/ccollect/defaults/pre_exec (same with post_exec), ccollect will start pre_exec before the whole backup process and post_exec after backup of all sources is done.

+

If pre_exec exits with a non-zero return code, the whole backup +process will be aborted.

+

The pre_exec and post_exec script can access the following exported variables:

+
    +
  • +

    +INTERVAL: the interval selected (daily) +

    +
    • +
  • +

    +no_sources: number of sources to backup (2) +

    +
    • +
  • +

    +source_$no: name of the source, $no starts at 0 ($source_0) +

    +
    • +

The following example describes how to report free disk space in human readable format before and after the whole backup process:

@@ -1086,6 +1108,32 @@ configuration, ccollect will execute this command before and respectively after doing the backup for this specific source. If you want to have pre-/post-exec before and after all backups, see above for general configuration.

+

If pre_exec exits with a non-zero return code, the backup +process of this source will be aborted (i.e. backup skipped).

+

The post_exec script can access the following exported variables from +ccollect:

+
    +
  • +

    +name: name of the source that is being backed up +

    +
    • +
  • +

    +destination_name: contains the base directory name (daily.20091031-1013.24496) +

    +
    • +
  • +

    +destination_dir: full path (/tmp/ccollect/daily.20091031-1013.24496) +

    +
    • +
  • +

    +destination_full: like destination_dir, but prepended with the remote_host, if set (host:/tmp/ccollect/daily.20091031-1013.24496 or /tmp/ccollect/daily.20091031-1013.24496) +

    +
    • +

Example:

@@ -1170,26 +1218,34 @@ Host bruehe

  • -INTERVAL: The interval specified on the command line +INTERVAL: The interval specified on the command line

  • -no_sources: number of sources +no_sources: number of sources

  • -source_$NUM: the name of the source +source_$NUM: the name of the source

  • -name: the name of the currently being backuped source (not available for +name: the name of the currently being backuped source (not available for generic pre_exec script)

+

Only available for post_exec:

+
    +
  • +

    +remote_host: name of host we backup to (empty if unused) +

    +
    • +

6.4. Using rsync protocol without ssh

When you have a computer with little computing power, it may be useful to use rsync without ssh, directly using the rsync protocol @@ -1623,8 +1679,8 @@ rsync -av -H --delete /mnt/archiv/ "$DDIR/archiv/"

diff --git a/software/ccollect/doc/ccollect.text b/software/ccollect/doc/ccollect.text index 100118b9..56e575b8 100644 --- a/software/ccollect/doc/ccollect.text +++ b/software/ccollect/doc/ccollect.text @@ -1,7 +1,7 @@ ccollect - Installing, Configuring and Using ============================================ Nico Schottelius -0.8, for ccollect 0.8, Initial Version from 2006-01-13 +0.8.1, for ccollect 0.8.1, Initial Version from 2006-01-13 :Author Initials: NS @@ -21,9 +21,9 @@ Supported and tested operating systems and architectures ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ `ccollect` was successfully tested on the following platforms: -- GNU/Linux on amd64/hppa/i386/ppc/ARM - FreeBSD on amd64/i386 -- Mac OS X 10.5 +- GNU/Linux on amd64/arm/hppa/i386/ppc +- Mac OS X 10.5 - NetBSD on alpha/amd64/i386/sparc/sparc64 - OpenBSD on amd64 @@ -159,7 +159,7 @@ For those who do not want to read the whole long document: -------------------------------------------------------------------------------- # get latest ccollect tarball from http://www.nico.schottelius.org/software/ccollect/ # replace value for CCV with the current version -export CCV=0.8 +export CCV=0.8.1 # # replace 'wget' with 'fetch' on bsd @@ -264,8 +264,10 @@ After having installed and used ccollect, report success using Configuring ----------- For configuration aid have a look at the above mentioned tools, which can assist -you quite well. When you are successfully using `ccollect`, report success using -`tools/report_success.sh`. +you quite well. When you are successfully using `ccollect`, I would be happy if +you add a link to your website, stating "I backup with ccollect", which points +to the ccollect homepage. So more people now about ccollect, use it and +improve it. You can also report success using `tools/report_success.sh`. Runtime options @@ -333,6 +335,15 @@ If you add '$CCOLLECT_CONF/defaults/`pre_exec`' or will start `pre_exec` before the whole backup process and `post_exec` after backup of all sources is done. +If `pre_exec` exits with a non-zero return code, the whole backup +process will be aborted. + +The `pre_exec` and `post_exec` script can access the following exported variables: + +- 'INTERVAL': the interval selected (`daily`) +- 'no_sources': number of sources to backup (`2`) +- 'source_$no': name of the source, '$no' starts at 0 (`$source_0`) + The following example describes how to report free disk space in human readable format before and after the whole backup process: ------------------------------------------------------------------------- @@ -597,6 +608,16 @@ respectively after doing the backup for *this specific* source. If you want to have pre-/post-exec before and after *all* backups, see above for general configuration. +If `pre_exec` exits with a non-zero return code, the backup +process of `this source` will be aborted (i.e. backup skipped). + +The `post_exec` script can access the following exported variables from +ccollect: + +- 'name': name of the source that is being backed up +- 'destination_name': contains the base directory name (`daily.20091031-1013.24496`) +- 'destination_dir': full path (`/tmp/ccollect/daily.20091031-1013.24496`) +- 'destination_full': like 'destination_dir', but prepended with the remote_host, if set (`host:/tmp/ccollect/daily.20091031-1013.24496` or `/tmp/ccollect/daily.20091031-1013.24496`) Example: -------------------------------------------------------------------------------- @@ -702,12 +723,16 @@ Using source names or interval in pre_/post_exec scripts ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The pre-/post_exec scripts can access some internal variables from `ccollect`: -- INTERVAL: The interval specified on the command line -- no_sources: number of sources -- source_$NUM: the name of the source -- name: the name of the currently being backuped source (not available for +- 'INTERVAL': The interval specified on the command line +- 'no_sources': number of sources +- 'source_$NUM': the name of the source +- 'name': the name of the currently being backuped source (not available for generic pre_exec script) +Only available for `post_exec`: + +- 'remote_host': name of host we backup to (empty if unused) + Using rsync protocol without ssh ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/software/ccollect/doc/man/ccollect.1 b/software/ccollect/doc/man/ccollect.1 index ac20efc1..01a30863 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/08/2009 +.\" Date: 11/01/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT" "1" "11/01/2009" "[FIXME: source]" "[FIXME: manual]" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -22,7 +22,7 @@ ccollect \- (pseudo) incremental backup with different exclude lists using hardlinks and rsync .SH "SYNOPSIS" .sp -\fIccollect\&.sh\fR [args] +\fIccollect\&.sh\fR [args] .SH "DESCRIPTION" .sp 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 \fIdash\fR, \fIksh\fR, \fIzsh\fR, \fIbash\fR, \&...)\&. @@ -47,7 +47,12 @@ Backup all sources specified in /etc/ccollect/sources .PP \-v, \-\-verbose .RS 4 -Be very verbose (uses set \-x)\&. +Be very verbose (uses set \-x) +.RE +.PP +\-V, \-\-version +.RS 4 +Show version and exit .RE .SH "SEE ALSO" .sp diff --git a/software/ccollect/doc/man/ccollect.htm b/software/ccollect/doc/man/ccollect.htm index 60b1c750..91fcd0ad 100644 --- a/software/ccollect/doc/man/ccollect.htm +++ b/software/ccollect/doc/man/ccollect.htm @@ -1,4 +1,4 @@ -ccollect(1)

ccollect(1)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
OPTIONS
SEE ALSO
AUTHOR
RESOURCES
COPYING

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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
OPTIONS
SEE ALSO
AUTHOR
RESOURCES
COPYING

NAME

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

SYNOPSIS

ccollect.sh [args] <interval name> <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), @@ -17,7 +17,11 @@ texinfo or html).

-v, --verbose
- Be very verbose (uses set -x). + Be very verbose (uses set -x) +
+-V, --version +
+ Show version and exit

SEE ALSO

ccollect_add_source(1), ccollect_analyse_logs(1), ccollect_logwrapper(1) ccollect_delete_source(1), ccollect_list_intervals(1)

AUTHOR

Nico Schottelius <nico-ccollect--@--schottelius.org>

RESOURCES

Main web site: http://www.nico.schottelius.org/software/ccollect/

COPYING

Copyright (C) 2006-2008 Nico Schottelius. Free use of this software is granted under the terms of the GNU General Public License Version 3 (GPLv3).

diff --git a/software/ccollect/doc/man/ccollect.html b/software/ccollect/doc/man/ccollect.html index 3db98766..4d5eaff8 100644 --- a/software/ccollect/doc/man/ccollect.html +++ b/software/ccollect/doc/man/ccollect.html @@ -394,7 +394,7 @@ div#toc a:visited { color: blue; }

2. SYNOPSIS

-

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

+

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

3. DESCRIPTION

@@ -437,7 +437,15 @@ texinfo or html).

- Be very verbose (uses set -x). + Be very verbose (uses set -x) +

+
+
+-V, --version +
+
+

+ Show version and exit

@@ -462,7 +470,7 @@ granted under the terms of the GNU General Public License Version 3 (GPLv3).

diff --git a/software/ccollect/doc/man/ccollect.text b/software/ccollect/doc/man/ccollect.text index 84e95bb0..84c1e37a 100644 --- a/software/ccollect/doc/man/ccollect.text +++ b/software/ccollect/doc/man/ccollect.text @@ -10,7 +10,7 @@ ccollect - (pseudo) incremental backup with different exclude lists using hardli SYNOPSIS -------- -'ccollect.sh' [args] +'ccollect.sh' [args] DESCRIPTION @@ -36,7 +36,10 @@ OPTIONS Backup all sources specified in /etc/ccollect/sources -v, --verbose:: - Be very verbose (uses set -x). + Be very verbose (uses set -x) + +-V, --version:: + Show version and exit SEE ALSO diff --git a/software/ccollect/doc/man/ccollect_add_source.1 b/software/ccollect/doc/man/ccollect_add_source.1 index 4271dedf..4f1183cd 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/08/2009 +.\" Date: 11/01/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_ADD_SOURCE" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_ADD_SOURCE" "1" "11/01/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 2fbb486e..6208dfe9 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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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 0db5ead8..d51d16fb 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/08/2009 +.\" Date: 11/01/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_ANALYSE_LOG" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_ANALYSE_LOG" "1" "11/01/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 83b1d004..4b2e9692 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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
FILES
EXAMPLES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
FILES
EXAMPLES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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 d7ff3b10..28180559 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/08/2009 +.\" Date: 11/01/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_DELETE_SOUR" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_DELETE_SOUR" "1" "11/01/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 fb30ac3b..2f5228ad 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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
OPTIONS
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
OPTIONS
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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 f2e4f0e9..50398310 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/08/2009 +.\" Date: 11/01/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_LIST_INTERV" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_LIST_INTERV" "1" "11/01/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 de779381..28af09e5 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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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 642d6d70..cf6a8370 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/08/2009 +.\" Date: 11/01/2009 .\" Manual: [FIXME: manual] .\" Source: [FIXME: source] .\" Language: English .\" -.TH "CCOLLECT_LOGWRAPPER" "1" "07/08/2009" "[FIXME: source]" "[FIXME: manual]" +.TH "CCOLLECT_LOGWRAPPER" "1" "11/01/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 b84dc98d..855f0f1d 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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
OPTIONS
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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)

Table of Contents

NAME
SYNOPSIS
DESCRIPTION
OPTIONS
FILES
SEE ALSO
AUTHOR
RESOURCES
COPYING

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