From 264a87d887c042eae404383b904e7be8180252ab Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 1 Jul 2009 22:44:36 +0200 Subject: [PATCH] update ccollect documentation Signed-off-by: Nico Schottelius --- software/ccollect/doc/ccollect-DE.htm | 72 ++-- software/ccollect/doc/ccollect-DE.html | 195 +++++++--- software/ccollect/doc/ccollect.htm | 208 +++++----- software/ccollect/doc/ccollect.html | 366 ++++++++++-------- software/ccollect/doc/ccollect.text | 7 +- software/ccollect/doc/man/ccollect.1 | 44 ++- software/ccollect/doc/man/ccollect.htm | 16 +- software/ccollect/doc/man/ccollect.html | 163 ++++++-- software/ccollect/doc/man/ccollect.text | 2 +- .../ccollect/doc/man/ccollect_add_source.1 | 58 +-- .../ccollect/doc/man/ccollect_add_source.htm | 8 +- .../ccollect/doc/man/ccollect_add_source.html | 169 +++++--- .../ccollect/doc/man/ccollect_add_source.text | 2 +- .../ccollect/doc/man/ccollect_analyse_logs.1 | 44 ++- .../doc/man/ccollect_analyse_logs.htm | 10 +- .../doc/man/ccollect_analyse_logs.html | 153 ++++++-- .../doc/man/ccollect_analyse_logs.text | 2 +- .../ccollect/doc/man/ccollect_delete_source.1 | 46 +-- .../doc/man/ccollect_delete_source.htm | 10 +- .../doc/man/ccollect_delete_source.html | 149 +++++-- .../doc/man/ccollect_delete_source.text | 2 +- .../doc/man/ccollect_list_intervals.1 | 44 ++- .../doc/man/ccollect_list_intervals.htm | 8 +- .../doc/man/ccollect_list_intervals.html | 147 +++++-- .../doc/man/ccollect_list_intervals.text | 2 +- .../ccollect/doc/man/ccollect_logwrapper.1 | 46 +-- .../ccollect/doc/man/ccollect_logwrapper.htm | 8 +- .../ccollect/doc/man/ccollect_logwrapper.html | 151 ++++++-- .../ccollect/doc/man/ccollect_logwrapper.text | 2 +- 29 files changed, 1367 insertions(+), 767 deletions(-) diff --git a/software/ccollect/doc/ccollect-DE.htm b/software/ccollect/doc/ccollect-DE.htm index a9a3b625..8a0e8dcb 100644 --- a/software/ccollect/doc/ccollect-DE.htm +++ b/software/ccollect/doc/ccollect-DE.htm @@ -1,94 +1,94 @@ -ccollect- Installieren, Konfigurieren und Anwenden

ccollect- Installieren, Konfigurieren und Anwenden

Revision History
Revision 0.1Initiale Version vom 2006-03-04JM

Table of Contents

Einleitung
Installation
Anforderungen
Installieren
Konfiguration
Konfigurationsverzeichnisse
Intervalle
Sources
Quelle
Ziel
Spezielles

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS +ccollect- Installieren, Konfigurieren und Anwenden

ccollect- Installieren, Konfigurieren und Anwenden

Revision History
Revision 0.1Initiale Version vom 2006-03-04JM

Table of Contents

Einleitung
Installation
Anforderungen
Installieren
Konfiguration
Konfigurationsverzeichnisse
Intervalle
Sources
Quelle
Ziel
Spezielles

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS AKTUALISIERT WERDEN (siehe Englische Version) inkrementelle Datensicherung -mit hardlinks und rsync

Einleitung

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS +mit hardlinks und rsync

Einleitung

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS AKTUALISIERT WERDEN (siehe Englische Version)

ccollect ist ein Backuptool geschrieben in der sh-skript Programmiersprache. -Es braucht nichts besonderes nur die /bin/sh-Konsole (oder eine kompatible).

Installation

Anforderungen

Die aufgelisteten Werkzeuge müssen für das Benutzen von ccollect installiert sein:

  • +Es braucht nichts besonderes nur die /bin/sh-Konsole (oder eine kompatible).

Installation

Anforderungen

Die aufgelisteten Werkzeuge müssen für das Benutzen von ccollect installiert sein:

  • bc -
  • +
  • cp -
  • +
  • rsync -
  • +
  • date -
  • +
  • ssh (optional, wenn man ssh-Verbindungen nutzen moechte)

Am besten überprüfen Sie das mit dem Befehl apt-get install bc rsync ssh. -Beim Fehlen eines Werkzeuges wird dieses nachinstalliert.

Installieren

  1. +Beim Fehlen eines Werkzeuges wird dieses nachinstalliert.

Installieren

  1. Laden Sie sich die neuste Version von ccollect herunter. Diese finden Sie unter: http://linux.schottelius.org/ccollect -
  2. +
  3. Wechseln Sie in der Konsole mit "cd Pfad" in das Verzeichniss, indem sich das ccollect Archiv befindet. Entpacken Sie das Archiv mit "tar xvfj ccollect-$version.tar.bz2". Am Besten ist es, wenn Sie jetzt in das Verzeichniss mit den entpackten Daten wechseln: "cd 'pfad/'ccollect-'version. -
  4. +
  5. Danach kopieren Sie die Datei ccollect.sh aus dem entpackten Archiv nach /usr/local/bin. Das geht mit dem Befehl "cp ccollect.sh /usr/local/bin". -
  6. +
  7. Nun ändern Sie die Rechte für die Datei damit jeder Benutzer das Programm verwenden kann: "chmod 0755 /usr/local/bin/ccollect.sh" -
  8. +
  9. Erstellen Sie nun das Konfigurationsverzeichnis für ccollect: "mkdir /etc/ccollect/" -
  10. +
  11. Starten sie nun zum Testen das Programm ccollect mit dem Befehl ccollect.sh in der Konsole. -

Konfiguration

Konfigurationsverzeichnisse

Die Konfigurationsdaten befinden sich bei ccollect im oben erstellten Verzeichnis +

Konfiguration

Konfigurationsverzeichnisse

Die Konfigurationsdaten befinden sich bei ccollect im oben erstellten Verzeichnis "/etc/ccollect". Um ccollect richtig konfigurieren zu können benötigen Sie -noch ein paar weitere Verzeichnisse:

  • +noch ein paar weitere Verzeichnisse:

    • "/etc/ccollect/defaults" mit: mkdir /etc/ccollect/defaults -
    • +
    • "/etc/ccollect/defaults/intervals" mit: mkdir /etc/ccollect/defaults/intervals -
    • +
    • "/etc/ccollect/sources" mit: mkdir /etc/ccollect/sources -

Intervalle

Der Intervall-Wert definiert, wie viele Backup-Versionen ccollect von +

Intervalle

Der Intervall-Wert definiert, wie viele Backup-Versionen ccollect von den gesicherten Daten behalten soll. Der Name der Datei, in der der Wert steht, ist zugleich auch der Name des Intervalls.

julian@flumy:/etc/ccollect/defaults/intervals$ ls
 daily
 julian@flumy:/etc/ccollect/defaults/intervals$ cat daily
 7
-julian@flumy:/etc/ccollect/defaults/intervals$

Intervall erstellen

Sie erstellen einen Intervall wie folgt:

  1. +julian@flumy:/etc/ccollect/defaults/intervals$

    Intervall erstellen

    Sie erstellen einen Intervall wie folgt:

    1. Wechseln Sie in das Intervall-Verzeichnis: cd /etc/ccollect/defaults/intervals. -
    2. +
    3. Erstellen Sie einen neuen Intervall mit dem Befehl "echo wert > Intervall-Name" -

Sources

Mit Sourcen meint man bei ccollect die Quelldaten. Der Wert einer source-Datei -verweist auf einen Pfad in dem sich die zu sichernden Daten befinden.

Im Ordner /etc/ccollect/sources/* wird festgelegt:

  • +

Sources

Mit Sourcen meint man bei ccollect die Quelldaten. Der Wert einer source-Datei +verweist auf einen Pfad in dem sich die zu sichernden Daten befinden.

Im Ordner /etc/ccollect/sources/* wird festgelegt:

  • Der Sicherungs-Titel -
  • +
  • Quell- und Ziel-Verzeichnis -
  • +
  • Spezielle Einstellungen -

Sicherungs-Titel

Der Sicherungstitel ist der Name eines Ordners in /etc/ccollect/sources.

Man erstellt also ein neue neue Sicherung mit dem Befehl +

Sicherungs-Titel

Der Sicherungstitel ist der Name eines Ordners in /etc/ccollect/sources.

Man erstellt also ein neue neue Sicherung mit dem Befehl "mkdir /etc/ccollect/sources/'Sicherungs-Titel". In diesem Verzeichnis folgen dann die spezifischen Konfigurationsdaten -(nur!) für diese Sicherung.

Quelle

Mit Quelle ist gemeint welche Daten gesichert werden. +(nur!) für diese Sicherung.

Quelle

Mit Quelle ist gemeint welche Daten gesichert werden. Dies wird in der Konfigurationsdatei source festgelegt.

Diese liegt im Verzeichnis "/etc/ccollect/sources/Sicherungs-Titel". Wechseln Sie in das Verzeichnis mit dem Sicherungs-Titel und erstellen Sie die -Datei mit "echo Quellpfad > source".

Exclude

Es kann vorkommen das man in einem Verzeichniss alles sichern will +Datei mit "echo Quellpfad > source".

Exclude

Es kann vorkommen das man in einem Verzeichniss alles sichern will bis auf ein paar Unterordner. Für dieses Vorhaben gibt es die Datei exclude, die sich wiederum -im Verzeichnis Sicherungs-Titel befindet.

Die Datei wird mit folgenden Schritten angelegt:

  1. +im Verzeichnis Sicherungs-Titel befindet.

    Die Datei wird mit folgenden Schritten angelegt:

    1. "echo 'Quellpfad/verzeichnis1 > exclude" Ein Pfad wird weggelassen. -
    2. +
    3. "echo Quellpfad/verzeichnis2 >> exclude" - Ein weiterer Pfad der weggelassen wird. Das zweite > bewirkt, - das an die 'exclude-Datei angefügt wird (das einfache > + Ein weiterer Pfad der weggelassen wird. Das zweite '> bewirkt, + das an die exclude-Datei angefügt wird (das einfache > ueberschreibt eine vorhandene Datei). -

Ziel

Mit dem Ziel ist gemeint wohin die Sicherung gespeichert wird. -Dies geschieht mit einer Verknüpfung (Link), die destination heisst.

Erstellen Sie diese mit den Befehlen

  • +

Ziel

Mit dem Ziel ist gemeint wohin die Sicherung gespeichert wird. +Dies geschieht mit einer Verknüpfung (Link), die destination heisst.

Erstellen Sie diese mit den Befehlen

  • "ln -s /Pfad/zum/Speicherort/ destination" -
  • +
  • Mit dem Befehl "ls -l destination" kann man die Richtigkeit der Verknüpfung überprüfen. -

Important

Es +

Important

Es darf immer nur @@ -99,7 +99,7 @@ und exclude Datei vorhanden -sein.

Spezielles

Im Ordner "/etc/ccollect/sources/Sicherung" kann man weitere Daten einfügen +sein.

Spezielles

Im Ordner "/etc/ccollect/sources/Sicherung" kann man weitere Daten einfügen und damit Optionen ein- oder auszuschalten.

verbose
diff --git a/software/ccollect/doc/ccollect-DE.html b/software/ccollect/doc/ccollect-DE.html index 32c67b42..f3ea6bfd 100644 --- a/software/ccollect/doc/ccollect-DE.html +++ b/software/ccollect/doc/ccollect-DE.html @@ -3,7 +3,8 @@ - + +ccollect- Installieren, Konfigurieren und Anwenden -ccollect- Installieren, Konfigurieren und Anwenden
-

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS +

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS AKTUALISIERT WERDEN (siehe Englische Version) inkrementelle Datensicherung mit hardlinks und rsync

@@ -323,15 +400,15 @@ mit hardlinks und rsync

1. Einleitung

-

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS +

DIESE ANLEITUNG IST NICHT AKTUELL UND MUSS AKTUALISIERT WERDEN (siehe Englische Version)

-

ccollect ist ein Backuptool geschrieben in der sh-skript Programmiersprache. +

ccollect ist ein Backuptool geschrieben in der sh-skript Programmiersprache. Es braucht nichts besonderes nur die /bin/sh-Konsole (oder eine kompatible).

2. Installation

2.1. Anforderungen

-
Die aufgelisteten Werkzeuge müssen für das Benutzen von ccollect installiert sein:
    +
    Die aufgelisteten Werkzeuge müssen für das Benutzen von ccollect installiert sein:

    • bc @@ -358,10 +435,10 @@ ssh (optional, wenn man ssh-Verbindungen nutzen moechte)

    -

    Am besten überprüfen Sie das mit dem Befehl apt-get install bc rsync ssh. +

    Am besten überprüfen Sie das mit dem Befehl apt-get install bc rsync ssh. Beim Fehlen eines Werkzeuges wird dieses nachinstalliert.

    2.2. Installieren

    -
      +

      1. Laden Sie sich die neuste Version von ccollect herunter. @@ -406,10 +483,10 @@ Starten sie nun zum Testen das Programm ccollect mit dem Befehl

        3. Konfiguration

        3.1. Konfigurationsverzeichnisse

        -

        Die Konfigurationsdaten befinden sich bei ccollect im oben erstellten Verzeichnis +

        Die Konfigurationsdaten befinden sich bei ccollect im oben erstellten Verzeichnis "/etc/ccollect". Um ccollect richtig konfigurieren zu können benötigen Sie noch ein paar weitere Verzeichnisse:

        -
          +

          • "/etc/ccollect/defaults" mit: @@ -430,7 +507,7 @@ noch ein paar weitere Verzeichnisse:

        3.2. Intervalle

        -

        Der Intervall-Wert definiert, wie viele Backup-Versionen ccollect von +

        Der Intervall-Wert definiert, wie viele Backup-Versionen ccollect von den gesicherten Daten behalten soll. Der Name der Datei, in der der Wert steht, ist zugleich auch der Name des Intervalls.

        @@ -443,8 +520,8 @@ julian@flumy:/etc/ccollect/defaults/intervals$ cat daily julian@flumy:/etc/ccollect/defaults/intervals$

        3.2.1. Intervall erstellen

        -

        Sie erstellen einen Intervall wie folgt:

        -
          +

          Sie erstellen einen Intervall wie folgt:

          +

          1. Wechseln Sie in das Intervall-Verzeichnis: cd /etc/ccollect/defaults/intervals. @@ -458,9 +535,9 @@ Erstellen Sie einen neuen Intervall mit dem Befehl

          3.3. Sources

          -

          Mit Sourcen meint man bei ccollect die Quelldaten. Der Wert einer source-Datei +

          Mit Sourcen meint man bei ccollect die Quelldaten. Der Wert einer source-Datei verweist auf einen Pfad in dem sich die zu sichernden Daten befinden.

          -
          Im Ordner /etc/ccollect/sources/* wird festgelegt:
            +
            Im Ordner /etc/ccollect/sources/* wird festgelegt:

            • Der Sicherungs-Titel @@ -478,24 +555,24 @@ Spezielle Einstellungen

            3.3.1. Sicherungs-Titel

            -

            Der Sicherungstitel ist der Name eines Ordners in /etc/ccollect/sources.

            -

            Man erstellt also ein neue neue Sicherung mit dem Befehl +

            Der Sicherungstitel ist der Name eines Ordners in /etc/ccollect/sources.

            +

            Man erstellt also ein neue neue Sicherung mit dem Befehl "mkdir /etc/ccollect/sources/'Sicherungs-Titel". In diesem Verzeichnis folgen dann die spezifischen Konfigurationsdaten (nur!) für diese Sicherung.

            3.4. Quelle

            -

            Mit Quelle ist gemeint welche Daten gesichert werden. +

            Mit Quelle ist gemeint welche Daten gesichert werden. Dies wird in der Konfigurationsdatei source festgelegt.

            -

            Diese liegt im Verzeichnis "/etc/ccollect/sources/Sicherungs-Titel". +

            Diese liegt im Verzeichnis "/etc/ccollect/sources/Sicherungs-Titel". Wechseln Sie in das Verzeichnis mit dem Sicherungs-Titel und erstellen Sie die Datei mit "echo Quellpfad > source".

            3.4.1. Exclude

            -

            Es kann vorkommen das man in einem Verzeichniss alles sichern will +

            Es kann vorkommen das man in einem Verzeichniss alles sichern will bis auf ein paar Unterordner. Für dieses Vorhaben gibt es die Datei exclude, die sich wiederum im Verzeichnis Sicherungs-Titel befindet.

            -

            Die Datei wird mit folgenden Schritten angelegt:

            -
              +

              Die Datei wird mit folgenden Schritten angelegt:

              +

              1. "echo 'Quellpfad/verzeichnis1 > exclude" @@ -505,16 +582,16 @@ im Verzeichnis Sicherungs-Titel befindet.

            1. "echo Quellpfad/verzeichnis2 >> exclude" - Ein weiterer Pfad der weggelassen wird. Das zweite > bewirkt, - das an die 'exclude-Datei angefügt wird (das einfache > + Ein weiterer Pfad der weggelassen wird. Das zweite '> bewirkt, + das an die exclude-Datei angefügt wird (das einfache > ueberschreibt eine vorhandene Datei).

            3.5. Ziel

            -

            Mit dem Ziel ist gemeint wohin die Sicherung gespeichert wird. +

            Mit dem Ziel ist gemeint wohin die Sicherung gespeichert wird. Dies geschieht mit einer Verknüpfung (Link), die destination heisst.

            -
            Erstellen Sie diese mit den Befehlen
              +
              Erstellen Sie diese mit den Befehlen

              • "ln -s /Pfad/zum/Speicherort/ destination" @@ -533,7 +610,7 @@ Mit dem Befehl "ls -l destination" kann man die Richtigkeit der

                Important
                -

                Es +

                Es darf immer nur @@ -549,10 +626,10 @@ sein.

                3.6. Spezielles

                -

                Im Ordner "/etc/ccollect/sources/Sicherung" kann man weitere Daten einfügen +

                Im Ordner "/etc/ccollect/sources/Sicherung" kann man weitere Daten einfügen und damit Optionen ein- oder auszuschalten.

                -
                -
                +
                +
                verbose
                @@ -560,7 +637,7 @@ und damit Optionen ein- oder auszuschalten.

                Beim Sicherungsvorgang ausführlich berichten (-v für rsync).

-
+
very_verbose
@@ -569,7 +646,7 @@ und damit Optionen ein- oder auszuschalten.

(-v für rsync, mkdir, cp und rm).

-
+
summary
@@ -578,7 +655,7 @@ und damit Optionen ein- oder auszuschalten.

Zusammenfassung des Geschehenen.

-
+
rsync_option
@@ -586,7 +663,7 @@ und damit Optionen ein- oder auszuschalten.

Alle Befehle in dieser Datei zu rsync werden ausgeführt beim Sicherungsvorgang.

-
+
pre_exec
@@ -594,7 +671,7 @@ und damit Optionen ein- oder auszuschalten.

Die Befehle im Inhalt dieser Datei werden vor dem Backup ausgeführt.

-
+
post_exec
@@ -607,7 +684,7 @@ und damit Optionen ein- oder auszuschalten.

diff --git a/software/ccollect/doc/ccollect.htm b/software/ccollect/doc/ccollect.htm index c2b5922f..331199ce 100644 --- a/software/ccollect/doc/ccollect.htm +++ b/software/ccollect/doc/ccollect.htm @@ -1,63 +1,65 @@ -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

Table of Contents

Introduction
Supported and tested operating systems and architectures
Why you COULD only backup from remote hosts, not to them
Incompatibilities
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.7.1for ccollect 0.7.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
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. +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:

  • +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 -
    • +
    • FreeBSD on amd64/i386 -
    • +
    • +Mac OS X 10.5 +
    • NetBSD on alpha/amd64/i386/sparc/sparc64 -
    • +
    • OpenBSD on amd64

    It should run on any Unix that supports rsync and has a POSIX-compatible bourne shell. If your platform is not listed above and you have it successfully -running, please drop me a mail.

    Why you COULD only backup from remote hosts, not to them

    While considering the design of ccollect, I thought about enabling +running, please drop me a mail.

    Why you COULD only backup from remote hosts, not to them

    While considering the design of ccollect, I thought about enabling backup to remote hosts. Though this sounds like a nice feature (Backup my notebook to the server now.), in my opinion it is a bad idea to backup to a remote host.

    But as more and more people requested this feature, it was implemented, -so you have the choice whether you want to use it or not.

    Reason

    If you want to backup TO a remote host, you have to loosen security on it.

    Imagine the following situation: You backup your farm of webservers TO +so you have the choice whether you want to use it or not.

    Reason

    If you want to backup TO a remote host, you have to loosen security on it.

    Imagine the following situation: You backup your farm of webservers TO a backup host somewhere else. Now one of your webservers which has access to your backup host gets -compromised.

    Your backup server will be compromised, too.

    And the attacker will have access to all data on the other webservers.

    Doing it securely

    Think of it the other way round: The backup server (now behind a +compromised.

    Your backup server will be compromised, too.

    And the attacker will have access to all data on the other webservers.

    Doing it securely

    Think of it the other way round: The backup server (now behind a firewall, not accessable from outside) connects to the webservers and pulls the data from them. If someone gets access to one of the webservers, this person will perhaps not even see your machine. If the attacker sees connections from a host to the compromised machine, she will not be able to log in on the backup machine. -All other backups are still secure.

    Incompatibilities

    Versions 0.6 and 0.7

    The format of destination changed:

    • +All other backups are still secure.

    Incompatibilities

    Versions 0.6 and 0.7

    The format of destination changed:

    • Before 0.7 it was a (link to a) directory -
    • +
    • As of 0.7 it is a textfile containing the destination -

    You can update your configuration using tools/config-pre-0.7-to-0.7.sh.

    Added remote_host

    • +

    You can update your configuration using tools/config-pre-0.7-to-0.7.sh.

    Added remote_host

    • As of 0.7 it is possible to backup to hosts (see section remote_host below). -

    Versions 0.5 and 0.6

    The format of rsync_options changed:

    • +

    Versions 0.5 and 0.6

    The format of rsync_options changed:

    • Before 0.6 it was whitespace delimeted -
    • +
    • As of 0.6 it is newline seperated (so you can pass whitespaces to rsync) -

    You can update your configuration using tools/config-pre-0.6-to-0.6.sh.

    The name of the backup directories changed:

    • +

    You can update your configuration using tools/config-pre-0.6-to-0.6.sh.

    The name of the backup directories changed:

    • Before 0.6: "date +%Y-%m-%d-%H%M" -
    • +
    • As of 0.6: "date +%Y%m%d-%H%M" (better readable, date is closer together)

    For the second change there is no updated needed, as XXXX- is always before -XXXXX (- comes before digit).

    Versions 0.4 and 0.5

    Not a real incompatibilty, but seems to fit in this section:

    0.5 does NOT require

    • +XXXXX (- comes before digit).

    Versions 0.4 and 0.5

    Not a real incompatibilty, but seems to fit in this section:

    0.5 does NOT require

    • PaX -
    • +
    • bc -

    anymore!

    Versions < 0.4 and 0.4

    Since ccollect 0.4 there are several incompatibilities with earlier -versions:

    List of incompatibilities

    • +

    anymore!

    Versions < 0.4 and 0.4

    Since ccollect 0.4 there are several incompatibilities with earlier +versions:

    List of incompatibilities

    • pax (Posix) is now required, cp -al (GNU specific) is removed -
    • +
    • "interval" was written with two l (ell), which is wrong in English -
    • +
    • Changed the name of backup directories, removed the colon in the interval -
    • +
    • ccollect will now exit when preexec returns non-zero -
    • +
    • ccollect now reports when postexec returns non-zero

    You can convert your old configuration directory using 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://unix.schottelius.org/ccollect/
+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.7.1
 
@@ -65,7 +67,7 @@ export CCV=0.7.1
 # replace 'wget' with 'fetch' on bsd
 #
 holen=wget
-"$holen" http://unix.schottelius.org/ccollect/ccollect-${CCV}.tar.bz2
+"$holen" http://www.nico.schottelius.org/software/ccollect/ccollect-${CCV}.tar.bz2
 
 # extract the tarball, change to the newly created directory
 tar -xvjf ccollect-${CCV}.tar.bz2
@@ -116,37 +118,37 @@ du -s ~/DASI /bin
 # report success
 echo "Please report success using ./tools/report_success.sh"

    Cutting and pasting the complete section above to your shell will result in the download of ccollect, the creation of a sample configuration and the -execution of some backups.

    Requirements

    Installing ccollect

    For the installation you need at least

    Requirements

    Installing ccollect

    For the installation you need at least

    Using ccollect

    Running ccollect requires the following tools to be installed:

    • +

    Using ccollect

    Running ccollect requires the following tools to be installed:

    • date -
    • +
    • rsync -
    • +
    • ssh (if you want to use rsync over ssh, which is recommened for security) -

    Installing

    Either type make install or simply copy it to a directory in your +

Installing

Either type make install or simply copy it to a directory in your $PATH and execute chmod 0755 /path/to/ccollect.sh. If you would like to use the new management scripts (available since 0.6), copy -the following scripts to a directory in $PATH:

  • +the following scripts to a directory in $PATH:

    • tools/ccollect_add_source.sh -
    • +
    • tools/ccollect_analyse_logs.sh.sh -
    • +
    • tools/ccollect_delete_source.sh -
    • +
    • tools/ccollect_list_intervals.sh -
    • +
    • 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 +./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 +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 ...
 
@@ -154,13 +156,13 @@ $ CCOLLECT_CONF=/your/config/dir ccollect.sh ...
 $ ( setenv CCOLLECT_CONF /your/config/dir ; ccollect.sh ... )

When you start ccollect, you have to specify in which interval to backup (daily, weekly, yearly; you can specify the names yourself, see below) and which sources to backup (or -a to backup all sources).

The interval specifies how many backups are kept.

There are also some self-explanatory parameters you can pass to ccollect, -simply use ccollect.sh —help for info.

General configuration

The general configuration can be found in $CCOLLECT_CONF/defaults or +simply use ccollect.sh --help for info.

General configuration

The general configuration can be found in $CCOLLECT_CONF/defaults or /etc/ccollect/defaults. All options specified there are generally valid for all source definitions, although the values can be overwritten in the source -configuration.

All configuration entries are plain-text files (use UTF-8 for non-ascii characters).

Interval definition

The interval definition can be found in +configuration.

All configuration entries are plain-text files (use UTF-8 for non-ascii characters).

Interval definition

The interval definition can be found in $CCOLLECT_CONF/defaults/intervals/ or /etc/ccollect/defaults/intervals. Each file in this directory specifies an interval. The name of the file is -the same as the name of the interval: intervals/<interval name>.

The content of this file should be a single line containing a number. +the same as the name of the interval: intervals/'<interval name>'.

The content of this file should be a single line containing a number. This number defines how many versions of this interval are kept.

Example:

   [10:23] zaphodbeeblebrox:ccollect-0.2% ls -l conf/defaults/intervals/
    insgesamt 12
    -rw-r--r--  1 nico users 3 2005-12-08 10:24 daily
@@ -169,7 +171,7 @@ This number defines how many versions of this interval are kept.
Example:<
    [10:23] zaphodbeeblebrox:ccollect-0.2% cat conf/defaults/intervals/*
    28
    12
-   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 + 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 @@ -178,30 +180,30 @@ human readable format before and after the whole backup process:

General delete_incomplete
If you add $CCOLLECT_CONF/defaults/delete_incomplete, this
+[13:01] hydrogenium:~# ln -s /etc/ccollect/defaults/pre_exec /etc/ccollect/defaults/post_exec

General delete_incomplete

If you add $CCOLLECT_CONF/defaults/delete_incomplete, this option applies for all sources. See below for a longer -explanation.

Source configuration

Each source configuration exists in $CCOLLECT_CONF/sources/$name or -/etc/ccollect/sources/$name.

The name you choose for the subdirectory describes the source.

Each source contains at least the following files:

  • +explanation.

Source configuration

Each source configuration exists in $CCOLLECT_CONF/sources/$name or +/etc/ccollect/sources/$name.

The name you choose for the subdirectory describes the source.

Each source contains at least the following files:

  • source (a text file containing the rsync compatible path to backup) -
  • +
  • destination (a text file containing the directory we should backup to) -

Additionally a source may have the following files:

  • +

Additionally a source may have the following files:

  • verbose whether to be verbose (passes -v to rsync) -
  • +
  • very_verbose be very verbose (mkdir -v, rm -v and rsync -vv) -
  • +
  • summary create a transfer summary when rsync finished -
  • +
  • exclude exclude list for rsync. newline seperated list. -
  • +
  • rsync_options extra options for rsync. newline seperated list. -
  • +
  • pre_exec program to execute before backing up this source -
  • +
  • post_exec program to execute after backing up this source -
  • +
  • delete_incomplete delete incomplete backups -
  • +
  • remote_host host to backup to

Example:

   [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l  conf/sources/testsource2
    insgesamt 12
@@ -219,21 +221,21 @@ explanation.

Detailed description of "source"

source describes a rsync compatible source (one line only).

For instance backup_user@foreign_host:/home/server/video. + /home/nico/vpn

Detailed description of "source"

source describes a rsync compatible source (one line only).

For instance backup_user@foreign_host:/home/server/video. To use the rsync protocol without the ssh-tunnel, use rsync::USER@HOST/SRC. For more information have a look at the manpage -of rsync(1).

Detailed description of "destination"

destination must be a text file containing the destination directory. +of rsync(1).

Detailed description of "destination"

destination must be a text file containing the destination directory. destination USED to be a link to the destination directory in earlier versions, so do not be confused if you see such examples.

Example:

   [11:36] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/destination
-   /home/nico/backupdir

Detailed description of "remote_host"

remote_host must be a text file containing the destination host. + /home/nico/backupdir

Detailed description of "remote_host"

remote_host must be a text file containing the destination host. If this file is existing, you are backing up your data TO this host and not to you local host.

Warning: You need to have ssh access to the remote host. rsync and ccollect will connect to that host via ssh. ccollect needs the shell access, because it needs to find out how many backups exist on the remote host and to be able to delete them.

Example:

   [10:17] denkbrett:ccollect-0.7.0% cat conf/sources/remote1/remote_host
-   home.schottelius.org

It may contain all the ssh-specific values like myuser@yourhost.ch.

Detailed description of "verbose"

verbose tells ccollect that the log should contain verbose messages.

If this file exists in the source specification -v will be passed to rsync.

` -Example:

   [11:35] zaphodbeeblebrox:ccollect-0.2% touch conf/sources/testsource1/verbose

Detailed description of "very_verbose"

very_verbose tells ccollect that it should log very verbosely.

If this file exists in the source specification -v will be passed to -rsync, rm and mkdir.

Example:

   [23:67] nohost:~% touch conf/sources/testsource1/very_verbose

Detailed description of "summary"

If you create the file summary in the source definition, + home.schottelius.org

It may contain all the ssh-specific values like myuser@yourhost.ch.

Detailed description of "verbose"

verbose tells ccollect that the log should contain verbose messages.

If this file exists in the source specification -v will be passed to rsync.

` +Example:

   [11:35] zaphodbeeblebrox:ccollect-0.2% touch conf/sources/testsource1/verbose

Detailed description of "very_verbose"

very_verbose tells ccollect that it should log very verbosely.

If this file exists in the source specification -v will be passed to +rsync, rm and mkdir.

Example:

   [23:67] nohost:~% touch conf/sources/testsource1/very_verbose

Detailed description of "summary"

If you create the file summary in the source definition, ccollect will present you a nice summary at the end.

backup:~# touch /etc/ccollect/sources/root/summary
 backup:~# ccollect.sh werktags root
 ==> ccollect.sh: Beginning backup using interval werktags <==
@@ -260,11 +262,11 @@ backup:~# ccollect.sh werktags root
 [root] Successfully finished backup.
 ==> Finished ccollect.sh <==

You could also combine it with verbose or very_verbose, but these already print some statistics (though not all / the same as presented by -summary).

Detailed description of "exclude"

exclude specifies a list of paths to exclude. The entries are seperated by a newline (\n).

Example:

   [11:35] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/exclude
+summary).

Detailed description of "exclude"

exclude specifies a list of paths to exclude. The entries are seperated by a newline (\n).

Example:

   [11:35] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/exclude
    openvpn-2.0.1.tar.gz
    nicht_reinnehmen
    etwas mit leerzeichenli
-   something with spaces is not a problem

Detailed description of "intervals/"

When you create the subdirectory intervals/ in your source configuration + something with spaces is not a problem

Detailed description of "intervals/"

When you create the subdirectory intervals/ in your source configuration directory, you can specify individiual intervals for this specific source. Each file in this directory describes an interval.

Example:

   [11:37] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/intervals/
    insgesamt 8
@@ -272,12 +274,12 @@ Each file in this directory describes an interval.
Example:
Detailled description of "rsync_options"
When you create the file rsync_options in your source configuration,
+   20
Detailled description of "rsync_options"
When you create the file rsync_options in your source configuration,
 all the parameters in this file will be passed to rsync. This
 way you can pass additional options to rsync. For instance you can tell rsync
-to show progress ("—progress"), or which -password-file ("—password-file")
+to show progress ("--progress"), or which -password-file ("--password-file")
 to use for automatic backup over the rsync-protocol.
Example:
   [23:42] hydrogenium:ccollect-0.2% cat conf/sources/test_rsync/rsync_options
-   --password-file=/home/user/backup/protected_password_file
Detailled description of "pre_exec" and "post_exec"
When you create pre_exec and / or post_exec in your source
+   --password-file=/home/user/backup/protected_password_file
Detailled description of "pre_exec" and "post_exec"
When you create pre_exec and / or post_exec in your source
 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
@@ -290,16 +292,16 @@ df -h
 #!/bin/sh
 
 # Show whats free after
-df -h
Detailed description of "delete_incomplete"
If you create the file delete_incomplete in a source specification directory,
+df -h
Detailed description of "delete_incomplete"
If you create the file delete_incomplete in a source specification directory,
 ccollect will look for incomplete backups (when the whole ccollect process
 was interrupted) and remove them. Without this file ccollect will only warn
-the user.
Hints
Smart logging
Since ccollect-0.6.1 you can use the ccollect-logwrapper.sh(1) for logging.
+the user.
Hints
Smart logging
Since ccollect-0.6.1 you can use the ccollect-logwrapper.sh(1) for logging.
 You call it the same way you call ccollect.sh and it will create a
 logfile containing the output of ccollect.sh. For more information look
 at the manpage ccollect-logwrapper. The following is an example running
 ccollect-logwrapper.sh:
u0219 ~ # ~chdscni9/ccollect-logwrapper.sh daily u0160.nshq.ch.netstream.com
 ccollect-logwrapper.sh (11722): Starting with arguments: daily u0160.nshq.ch.netstream.com
-ccollect-logwrapper.sh (11722): Finished.
Using a different ssh port
Mostly easy is to use your ~/.ssh/config file:
host mx2.schottelius.org
+ccollect-logwrapper.sh (11722): Finished.
Using a different ssh port
Mostly easy is to use your ~/.ssh/config file:
host mx2.schottelius.org
    Port 2342
If you only use that port for backup only and normally want to use another port,
 you can add HostName and "HostKeyAlias" (if you also have different
 keys on the different ports):
Host hhydrogenium
@@ -310,16 +312,16 @@ keys on the different ports):
Host hhydrogenium
 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:
  • 
+   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
-
  • 
+
  • 
 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)
-
Using rsync protocol without ssh
When you have a computer with little computing power, it may be useful to use
+
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
 rsync_options to specify a password file to use for automatic backup.
Example:
backup:~# cat /etc/ccollect/sources/sample.backup.host.org/source
@@ -329,11 +331,11 @@ backup:~# cat /etc/ccollect/sources/sample.backup.host.org/rsync_options
 --password-file=/etc/ccollect/sources/sample.backup.host.org/rsync_password
 
 backup:~# cat /etc/ccollect/sources/sample.backup.host.org/rsync_password
-this_is_the_rsync_password
This hint was reported by Daniel Aubry.
Not excluding top-level directories
When you exclude "/proc" or "/mnt" from your backup, you may run into
-trouble when you restore your backup. When you use "/proc/*" or "/mnt/*"
-instead, ccollect will backup empty directories.
Note
When those directories contain hidden files
+this_is_the_rsync_password
This hint was reported by Daniel Aubry.
Not excluding top-level directories
When you exclude "/proc" or "/mnt" from your backup, you may run into
+trouble when you restore your backup. When you use "/proc/*" or "/mnt/\*"
+instead, ccollect will backup empty directories.
Note
When those directories contain hidden files
 (those beginning with a dot (.)),
-they will still be transferred!
This hint was reported by Marcus Wagner.
Re-using already created rsync-backups
If you used rsync directly before you use ccollect, you can
+they will still be transferred!
This hint was reported by Marcus Wagner.
Re-using already created rsync-backups
If you used rsync directly before you use ccollect, you can
 use this old backup as initial backup for ccollect: You
 simply move it into a directory below the destination directory
 and name it "interval.0".
Example:
backup:/home/backup/web1# ls
@@ -346,8 +348,8 @@ backup:/home/backup/web1# mkdir daily.0
 backup:/home/backup/web1# mv * daily.0 2>/dev/null
 
 backup:/home/backup/web1# ls
-daily.0
Now you can use /home/backup/web1 as the destination for the backup.
Note
It does not matter anymore how you name your directory, as ccollect uses
-the -c option from ls to find out which directory to clone from.
Note
Older versions (pre 0.6, iirc) had a problem, if you named the first backup
+daily.0
Now you can use /home/backup/web1 as the destination for the backup.
Note
It does not matter anymore how you name your directory, as ccollect uses
+the -c option from ls to find out which directory to clone from.
Note
Older versions (pre 0.6, iirc) had a problem, if you named the first backup
 something like "daily.initial". It was needed to use the "0" (or some
 number that is lower than the current year) as extension. ccollect
 used sort to find the latest backup. ccollect itself uses
@@ -356,12 +358,12 @@ used sort to find the latest backup. sort. So, if you had a directory named "daily.initial",
 ccollect always diffed against this backup and transfered and deleted
 files which where deleted in previous backups. This means you simply
-wasted resources, but your backup had beer complete anyway.
Using pre_/post_exec
Your pre_/post_exec script does not need to be a script, you can also
-use a link to
  • 
+wasted resources, but your backup had beer complete anyway.
Using pre_/post_exec
Your pre_/post_exec script does not need to be a script, you can also
+use a link to
  • 
 an existing program
-
  • 
+
  • 
 an already written script
-
The only requirement is that it is executable.
Using source specific interval definitions
When you are backing up multiple hosts via cron each night, it may be
+
The only requirement is that it is executable.
Using source specific interval definitions
When you are backing up multiple hosts via cron each night, it may be
 a problem that host "big_server" may only have 4 daily backups, because
 otherwise its backup device will be full. But for all other hosts
 you want to keep 20 daily backups. In this case you would create
@@ -369,26 +371,26 @@ you want to keep 20 daily backups. In this case you would create
 /etc/ccollect/sources/big_server/intervals/daily containing "4".
Source specific intervals always overwrite the default values.
 If you have to specify it individually for every host, because
 of different requirements, you can even omit creating
-/etc/ccollect/default/intervals/daily.
Comparing backups
If you want to see what changed between two backups, you can use
+/etc/ccollect/default/intervals/daily.
Comparing backups
If you want to see what changed between two backups, you can use
 rsync directly:
[12:00] u0255:ddba034.netstream.ch#  rsync -n -a --delete --stats --progress daily.20080324-0313.17841/ daily.20080325-0313.31148/
This results in a listing of changes. Because we pass -n to rsync no transfer
-is made (i.e. report only mode)"
This hint was reported by Daniel Aubry.
Testing for host reachabilty
If you want to test whether the host you try to backup is reachable, you can use
+is made (i.e. report only mode)"
This hint was reported by Daniel Aubry.
Testing for host reachabilty
If you want to test whether the host you try to backup is reachable, you can use
 the following script as source specific pre-exec:
#!/bin/sh
-# ping -c1 -q `cat "/etc/ccollect/sources/$name/source" | cut -d"@" -f2 | cut -d":" -f1`
This prevents the deletion of old backups, if the host is not reachable.
This hint was reported by Daniel Aubry.
Easy check for errors
If you want to see whether there have been any errors while doing the backup,
-you can run ccollect together with ccollect_analyse_logs.sh:
$ ccollect | ccollect_analyse_logs.sh e
F.A.Q.
What happens if one backup is broken or empty?
Let us assume that one backup failed (connection broke or the source
-hard disk had some failures). Therefore we've got one incomplete backup in our history.
ccollect will transfer the missing files the next time you use it.
-This leads to
  • 
+# ping -c1 -q `cat "/etc/ccollect/sources/$name/source" | cut -d"@" -f2 | cut -d":" -f1`
    This prevents the deletion of old backups, if the host is not reachable.
    This hint was reported by Daniel Aubry.
Easy check for errors
If you want to see whether there have been any errors while doing the backup,
+you can run ccollect together with ccollect_analyse_logs.sh:
$ ccollect | ccollect_analyse_logs.sh e
F.A.Q.
What happens if one backup is broken or empty?
Let us assume that one backup failed (connection broke or the source
+hard disk had some failures). Therefore we’ve got one incomplete backup in our history.
ccollect will transfer the missing files the next time you use it.
+This leads to
  • 
 more transferred files
-
  • 
+
  • 
 much greater disk space usage, as no hardlinks can be used
 
If the whole ccollect process was interrupted, ccollect (since 0.6) can
 detect that and remove the incomplete backups, so you can clone from a complete
-backup instead
When backing up from localhost the destination is also included. Is this a bug?
No. ccollect passes your source definition directly to rsync. It
+backup instead
When backing up from localhost the destination is also included. Is this a bug?
No. ccollect passes your source definition directly to rsync. It
 does not try to analyze it. So it actually does not know if a source
 comes from local harddisk or from a remote server. And it does not want
 to. When you backup from the local harddisk (which is perhaps not
 even a good idea when thinking of security), add the destination
-to source/exclude. (Daniel Aubry reported this problem)
Why does ccollect say "Permission denied" with my pre-/postexec script?
The most common error is that you have not given your script the correct
-permissions. Try chmod 0755 /etc/ccollect/sources/yoursource/*_exec`.
Why does the backup job fail when part of the source is a link?
When a part of your path you specified in the source is a
+to source/exclude. (Daniel Aubry reported this problem)
Why does ccollect say "Permission denied" with my pre-/postexec script?
The most common error is that you have not given your script the correct
+permissions. Try chmod 0755 /etc/ccollect/sources/'yoursource'/*_exec`.
Why does the backup job fail when part of the source is a link?
When a part of your path you specified in the source is a
 (symbolic, hard links are not possible for directories) link,
 the backup must fail.
First of all, let us have a look at how it looks like:
==> ccollect 0.4: Beginning backup using interval taeglich <==
 [testsource] Sa Apr 29 00:01:55 CEST 2006 Beginning to backup
@@ -407,12 +409,12 @@ lrwxrwxrwx 1 nico nico 29 2006-04-29 00:01 projekte -> oeffentlich/computer/p
 This link now links to something not reachable (dead link). It is
 impossible to create subdirectories under the broken link.
In conclusion you cannot use paths with a linked part.
However, you can backup directories containing symbolic links
 (in this case you could backup /home/user/nico, which contains
-/home/user/nico/projekte and oeffentlich/computer/projekte).
How can I prevent missing the right time to enter my password?
As ccollect first deletes the old backups, it may take some time
+/home/user/nico/projekte and oeffentlich/computer/projekte).
How can I prevent missing the right time to enter my password?
As ccollect first deletes the old backups, it may take some time
 until rsync requests the password for the ssh session from you.
The easiest way not to miss that point is running ccollect in screen,
 which has the ability to monitor the output for activity. So as soon as
 your screen beeps, after ccollect began to remove the last directory,
 you can enter your password (have a look at screen(1), especially "C-a M"
-and "C-a _", for more information).
Examples
A backup host configuration from scratch
srwali01:~# mkdir /etc/ccollect
+and "C-a _", for more information).
Examples
A backup host configuration from scratch
srwali01:~# mkdir /etc/ccollect
 srwali01:~# mkdir -p /etc/ccollect/defaults/intervals/
 srwali01:~# echo 28 > /etc/ccollect/defaults/intervals/taeglich
 srwali01:~# echo 52 > /etc/ccollect/defaults/intervals/woechentlich
@@ -457,7 +459,7 @@ srwali01:/etc/ccollect/sources/srwali03# cat > exclude << EOF
 > EOF
 srwali01:/etc/ccollect/sources/srwali03# echo 'root@10.103.2.3:/' > source
 srwali01:/etc/ccollect/sources/srwali03# echo /mnt/hdbackup/srwali03 > destination
-srwali01:/etc/ccollect/sources/srwali03# mkdir /mnt/hdbackup/srwali03
Using hard-links requires less disk space
# du (coreutils) 5.2.1
+srwali01:/etc/ccollect/sources/srwali03# mkdir /mnt/hdbackup/srwali03
Using hard-links requires less disk space
# du (coreutils) 5.2.1
 [10:53] srsyg01:sources% du -sh ~/backupdir
 4.6M    /home/nico/backupdir
 [10:53] srsyg01:sources% du -sh ~/backupdir/*
@@ -502,7 +504,7 @@ du (GNU coreutils) 5.93
 12G     hydrogenium/durcheinander.2006-01-17-00:27.13820
 1.5G    hydrogenium/durcheinander.2006-01-25-23:18.31328
 200M    hydrogenium/durcheinander.2006-01-26-00:11.3332
In the second report (without -l) the sizes include the space the inodes of
-the hardlinks allocate.
A collection of backups on the backup server
All the data of my important hosts is backuped to eiche into
+the hardlinks allocate.
A collection of backups on the backup server
All the data of my important hosts is backuped to eiche into
 /mnt/schwarzesloch/backup:
[9:24] eiche:backup# ls *
 creme:
 woechentlich.2006-01-26-22:22.4153   woechentlich.2006-02-12-11:48.2461
@@ -542,7 +544,7 @@ DDIR=/mnt/usb/backup
 
 rsync -av -H --delete /mnt/schwarzesloch/ "$DDIR/schwarzesloch/"
 
-rsync -av -H --delete /mnt/archiv/ "$DDIR/archiv/"
Processes running when doing ccollect -p
Truncated output from ps axuwwwf:
   S+   11:40   0:00  |   |   |   \_ /bin/sh /usr/local/bin/ccollect.sh daily -p ddba034 ddba045 ddba046 ddba047 ddba049 ddna010 ddna011
+rsync -av -H --delete /mnt/archiv/ "$DDIR/archiv/"
Processes running when doing ccollect -p
Truncated output from ps axuwwwf:
   S+   11:40   0:00  |   |   |   \_ /bin/sh /usr/local/bin/ccollect.sh daily -p ddba034 ddba045 ddba046 ddba047 ddba049 ddna010 ddna011
    S+   11:40   0:00  |   |   |       \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba034
    S+   11:40   0:00  |   |   |       |   \_ /bin/sh /usr/local/bin/ccollect.sh daily ddba034
    R+   11:40  23:40  |   |   |       |   |   \_ rsync -a --delete --numeric-ids --relative --delete-excluded --link-dest=/home/server/backup/ddba034
diff --git a/software/ccollect/doc/ccollect.html b/software/ccollect/doc/ccollect.html
index 8ba3ae26..d83be18b 100644
--- a/software/ccollect/doc/ccollect.html
+++ b/software/ccollect/doc/ccollect.html
@@ -3,7 +3,8 @@
 
 
 
-
+
+ccollect - Installing, Configuring and Using
 
-ccollect - Installing, Configuring and Using
 
 
 
 

 

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

 

 

 
1. Introduction

 

-
ccollect is a backup utility written in the sh-scripting language.
+
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, …).

 
1.1. Supported and tested operating systems and architectures

-
ccollect was successfully tested on the following platforms:

-
    
+
    ccollect was successfully tested on the following platforms:
    
+
      
 
    • 
 
      
 GNU/Linux on amd64/hppa/i386/ppc
@@ -376,6 +417,11 @@ FreeBSD   on amd64/i386
 
      • 
 
    • 
 
      
+Mac OS X 10.5
+
      
+
      • 
+
    • 
+
      
 NetBSD    on alpha/amd64/i386/sparc/sparc64
 
      
 
      • 
@@ -385,26 +431,26 @@ OpenBSD   on amd64
 
      
 
 
    
-
    It should run on any Unix that supports rsync and has a POSIX-compatible
+
    It should run on any Unix that supports rsync and has a POSIX-compatible
 bourne shell. If your platform is not listed above and you have it successfully
 running, please drop me a mail.
    
 
    1.2. Why you COULD only backup from remote hosts, not to them
    
-
    While considering the design of ccollect, I thought about enabling
+
    While considering the design of ccollect, I thought about enabling
 backup to remote hosts. Though this sounds like a nice feature
 (Backup my notebook to the server now.), in my opinion it is a
 bad idea to backup to a remote host.
    
-
    But as more and more people requested this feature, it was implemented,
+
    But as more and more people requested this feature, it was implemented,
 so you have the choice whether you want to use it or not.
    
 
    1.2.1. Reason
    
-
    If you want to backup TO a remote host, you have to loosen security on it.
    
-
    Imagine the following situation: You backup your farm of webservers TO
+
    If you want to backup TO a remote host, you have to loosen security on it.
    
+
    Imagine the following situation: You backup your farm of webservers TO
 a backup host somewhere else.
 Now one of your webservers which has access to your backup host gets
 compromised.
    
-
    Your backup server will be compromised, too.
    
-
    And the attacker will have access to all data on the other webservers.
    
+
    Your backup server will be compromised, too.
    
+
    And the attacker will have access to all data on the other webservers.
    
 
    1.2.2. Doing it securely
    
-
    Think of it the other way round: The backup server (now behind a
+
    Think of it the other way round: The backup server (now behind a
 firewall, not accessable from outside) connects to the
 webservers and pulls the data from them. If someone gets access to one
 of the webservers, this person will perhaps not even see your machine. If
@@ -413,7 +459,7 @@ machine, she will not be able to log in on the backup machine.
 All other backups are still secure.
    
 
    1.3. Incompatibilities
    
 
    1.3.1. Versions 0.6 and 0.7
    
-
    The format of destination changed:
      
+
      The format of destination changed:
        
 
      • 
 
        
 Before 0.7 it was a (link to a) directory
@@ -425,8 +471,8 @@ As of 0.7 it is a textfile containing the destination
 
        
 
        • 
 
      
-
      You can update your configuration using tools/config-pre-0.7-to-0.7.sh.
      
-
      Added remote_host
        
+
        You can update your configuration using tools/config-pre-0.7-to-0.7.sh.
        
+
        Added remote_host
          
 
        • 
 
          
 As of 0.7 it is possible to backup to hosts (see section remote_host below).
@@ -434,7 +480,7 @@ As of 0.7 it is possible to backup to hosts (see section remote
 
          • 
 
        
 
        1.3.2. Versions 0.5 and 0.6
        
-
        The format of rsync_options changed:
          
+
          The format of rsync_options changed:
            
 
          • 
 
            
 Before 0.6 it was whitespace delimeted
@@ -446,8 +492,8 @@ As of 0.6 it is newline seperated (so you can pass whitespaces to rsync
 
            
 
            • 
 
          
-
          You can update your configuration using tools/config-pre-0.6-to-0.6.sh.
          
-
          The name of the backup directories changed:
            
+
            You can update your configuration using tools/config-pre-0.6-to-0.6.sh.
            
+
            The name of the backup directories changed:
              
 
            • 
 
              
 Before 0.6: "date +%Y-%m-%d-%H%M"
@@ -459,11 +505,11 @@ As of 0.6:  "date +%Y%m%d-%H%M" (better readable, date is closer together)
 
              
 
              • 
 
            
-
            For the second change there is no updated needed, as XXXX- is always before
+
            For the second change there is no updated needed, as XXXX- is always before
 XXXXX (- comes before digit).
            
 
            1.3.3. Versions 0.4 and 0.5
            
-
            Not a real incompatibilty, but seems to fit in this section:
            
-
            0.5 does NOT require
              
+
              Not a real incompatibilty, but seems to fit in this section:
              
+
              0.5 does NOT require
                
 
              • 
 
                
 PaX
@@ -475,11 +521,11 @@ bc
 
                
 
                • 
 
              
-
              anymore!
              
+
              anymore!
              
 
              1.3.4. Versions < 0.4 and 0.4
              
-
              Since ccollect 0.4 there are several incompatibilities with earlier
+
              Since ccollect 0.4 there are several incompatibilities with earlier
 versions:
              
-
              List of incompatibilities
                
+
                List of incompatibilities
                  
 
                • 
 
                  
 pax (Posix) is now required, cp -al (GNU specific) is removed
@@ -506,7 +552,7 @@ ccollect now reports when postexec returns non-zero
 
                  
 
                  • 
 
                
-
                You can convert your old configuration directory using
+
                You can convert your old configuration directory using
 config-pre-0.4-to-0.4.sh, which can be found in the tools/
 subdirectory:
                
 
                
@@ -516,10 +562,10 @@ subdirectory:
                
 
                
 
                2. Quick start
                
 
                
-
                For those who do not want to read the whole long document:
                
+
                For those who do not want to read the whole long document:
                
 
                
 
                
-
                # get latest ccollect tarball from http://unix.schottelius.org/ccollect/
+
                # get latest ccollect tarball from http://www.nico.schottelius.org/software/ccollect/
 # replace value for CCV with the current version
 export CCV=0.7.1
 
@@ -527,7 +573,7 @@ export CCV=0.7.1
 # replace 'wget' with 'fetch' on bsd
 #
 holen=wget
-"$holen" http://unix.schottelius.org/ccollect/ccollect-${CCV}.tar.bz2
+"$holen" http://www.nico.schottelius.org/software/ccollect/ccollect-${CCV}.tar.bz2
 
 # extract the tarball, change to the newly created directory
 tar -xvjf ccollect-${CCV}.tar.bz2
@@ -578,18 +624,18 @@ du -s ~/DASI /bin
 # report success
 echo "Please report success using ./tools/report_success.sh"
                
 
                
-
                Cutting and pasting the complete section above to your shell will result in
+
                Cutting and pasting the complete section above to your shell will result in
 the download of ccollect, the creation of a sample configuration and the
 execution of some backups.
                
 
                
 
                3. Requirements
                
 
                
 
                3.1. Installing ccollect
                
-
                For the installation you need at least
                
-
                  
+
                  For the installation you need at least
                  
+
                  
 
                  3.2. Using ccollect
                  
-
                  Running ccollect requires the following tools to be installed:
                    
+
                    Running ccollect requires the following tools to be installed:
                      
 
                    • 
 
                      
 date
@@ -629,11 +675,11 @@ for rebuilding the generated documentation: additionally asciidoc
 
                    
 
                    4. Installing
                    
 
                    
-
                    Either type make install or simply copy it to a directory in your
+
                    Either type make install or simply copy it to a directory in your
 $PATH and execute chmod 0755 /path/to/ccollect.sh. If you would
 like to use the new management scripts (available since 0.6), copy
 the following scripts to a directory in $PATH:
                    
-
                      
+
                        
 
                      • 
 
                        
 tools/ccollect_add_source.sh
@@ -660,16 +706,16 @@ the following scripts to a directory in $PATH:
                      
 
                      
 
 
                    
-
                    After having installed and used ccollect, report success using
+
                    After having installed and used ccollect, report success using
 ./tools/report_success.sh.
                    
 
                    
 
                    5. Configuring
                    
 
                    
-
                    For configuration aid have a look at the above mentioned tools, which can assist
+
                    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.
                    
 
                    5.1. Runtime options
                    
-
                    ccollect looks for its configuration in /etc/ccollect or, if set, in
+
                    ccollect looks for its configuration in /etc/ccollect or, if set, in
 the directory specified by the variable $CCOLLECT_CONF:
                    
 
                    
 
                    
@@ -679,26 +725,26 @@ $ CCOLLECT_CONF=/your/config/dir ccollect.sh ...
 # csh
 $ ( setenv CCOLLECT_CONF /your/config/dir ; ccollect.sh ... )

 

-
When you start ccollect, you have to specify in which interval
+
When you start ccollect, you have to specify in which interval
 to backup (daily, weekly, yearly; you can specify the names yourself, see below)
 and which sources to backup (or -a to backup all sources).

-
The interval specifies how many backups are kept.

-
There are also some self-explanatory parameters you can pass to ccollect,
-simply use ccollect.sh —help for info.

+
The interval specifies how many backups are kept.

+
There are also some self-explanatory parameters you can pass to ccollect,
+simply use ccollect.sh --help for info.

 
5.2. General configuration

-
The general configuration can be found in $CCOLLECT_CONF/defaults or
+
The general configuration can be found in $CCOLLECT_CONF/defaults or
 /etc/ccollect/defaults. All options specified there are generally valid for
 all source definitions, although the values can be overwritten in the source
 configuration.

-
All configuration entries are plain-text files (use UTF-8 for non-ascii characters).

+
All configuration entries are plain-text files (use UTF-8 for non-ascii characters).

 
5.2.1. Interval definition

-
The interval definition can be found in
+
The interval definition can be found in
 $CCOLLECT_CONF/defaults/intervals/ or /etc/ccollect/defaults/intervals.
 Each file in this directory specifies an interval. The name of the file is
-the same as the name of the interval: intervals/<interval name>.

-
The content of this file should be a single line containing a number.
+the same as the name of the interval: intervals/'<interval name>'.

+
The content of this file should be a single line containing a number.
 This number defines how many versions of this interval are kept.

-
Example:

+
Example:

 

 

 
   [10:23] zaphodbeeblebrox:ccollect-0.2% ls -l conf/defaults/intervals/
@@ -711,13 +757,13 @@ This number defines how many versions of this interval are kept.

    12
    4
 

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

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

 
5.2.2. General pre- and post-execution

-
If you add $CCOLLECT_CONF/defaults/pre_exec or
+
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
+
The following example describes how to report free disk space in
 human readable format before and after the whole backup process:

 

 

@@ -729,15 +775,15 @@ human readable format before and after the whole backup process:

 [13:01] hydrogenium:~# ln -s /etc/ccollect/defaults/pre_exec /etc/ccollect/defaults/post_exec
 

 
5.2.3. General delete_incomplete

-
If you add $CCOLLECT_CONF/defaults/delete_incomplete, this
+
If you add $CCOLLECT_CONF/defaults/delete_incomplete, this
 option applies for all sources. See below for a longer
 explanation.

 
5.3. Source configuration

-
Each source configuration exists in $CCOLLECT_CONF/sources/$name or
+
Each source configuration exists in $CCOLLECT_CONF/sources/$name or
 /etc/ccollect/sources/$name.

-
The name you choose for the subdirectory describes the source.

-
Each source contains at least the following files:

-
    
+
    The name you choose for the subdirectory describes the source.
    
+
    Each source contains at least the following files:
    
+
      
 
    • 
 
      
 source       (a text file containing the rsync compatible path to backup)
@@ -749,8 +795,8 @@ explanation.
    
 
    
 
 

-
Additionally a source may have the following files:

-
    
+
    Additionally a source may have the following files:
    
+
      
 
    • 
 
      
 verbose             whether to be verbose (passes -v to rsync)
@@ -797,7 +843,7 @@ explanation.
    
 
    
 
 

-
Example:

+
Example:

 

 

 
   [10:47] zaphodbeeblebrox:ccollect-0.2% ls -l  conf/sources/testsource2
@@ -819,56 +865,56 @@ explanation.

    /home/nico/vpn
 

 
5.3.1. Detailed description of "source"

-
source describes a rsync compatible source (one line only).

-
For instance backup_user@foreign_host:/home/server/video.
+
source describes a rsync compatible source (one line only).

+
For instance backup_user@foreign_host:/home/server/video.
 To use the rsync protocol without the ssh-tunnel, use
 rsync::USER@HOST/SRC. For more information have a look at the manpage
 of rsync(1).

 
5.3.2. Detailed description of "destination"

-
destination must be a text file containing the destination directory.
+
destination must be a text file containing the destination directory.
 destination USED to be a link to the destination directory in
 earlier versions, so do not be confused if you see such examples.

-
Example:

+
Example:

 

 

 
   [11:36] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/destination
    /home/nico/backupdir

 

 
5.3.3. Detailed description of "remote_host"

-
remote_host must be a text file containing the destination host.
+
remote_host must be a text file containing the destination host.
 If this file is existing, you are backing up your data TO this host
 and not to you local host.

-
Warning: You need to have ssh access to the remote host. rsync and
+
Warning: You need to have ssh access to the remote host. rsync and
 ccollect will connect to that host via ssh. ccollect needs the shell
 access, because it needs to find out how many backups exist on the remote
 host and to be able to delete them.

-
Example:

+
Example:

 

 

 
   [10:17] denkbrett:ccollect-0.7.0% cat conf/sources/remote1/remote_host
    home.schottelius.org

 

-
It may contain all the ssh-specific values like myuser@yourhost.ch.

+
It may contain all the ssh-specific values like myuser@yourhost.ch.

 
5.3.4. Detailed description of "verbose"

-
verbose tells ccollect that the log should contain verbose messages.

-
If this file exists in the source specification -v will be passed to rsync.

-
`
+
verbose tells ccollect that the log should contain verbose messages.

+
If this file exists in the source specification -v will be passed to rsync.

+
`
 Example:

 

 

 
   [11:35] zaphodbeeblebrox:ccollect-0.2% touch conf/sources/testsource1/verbose

 

 
5.3.5. Detailed description of "very_verbose"

-
very_verbose tells ccollect that it should log very verbosely.

-
If this file exists in the source specification -v will be passed to
+
very_verbose tells ccollect that it should log very verbosely.

+
If this file exists in the source specification -v will be passed to
 rsync, rm and mkdir.

-
Example:

+
Example:

 

 

 
   [23:67] nohost:~% touch conf/sources/testsource1/very_verbose

 

 
5.3.6. Detailed description of "summary"

-
If you create the file summary in the source definition,
+
If you create the file summary in the source definition,
 ccollect will present you a nice summary at the end.

 

 

@@ -898,12 +944,12 @@ backup:~# ccollect.sh werktags root
 [root] Successfully finished backup.
 ==> Finished ccollect.sh <==
 

-
You could also combine it with verbose or very_verbose, but these
+
You could also combine it with verbose or very_verbose, but these
 already print some statistics (though not all / the same as presented by
 summary).

 
5.3.7. Detailed description of "exclude"

-
exclude specifies a list of paths to exclude. The entries are seperated by a newline (\n).

-
Example:

+
exclude specifies a list of paths to exclude. The entries are seperated by a newline (\n).

+
Example:

 

 

 
   [11:35] zaphodbeeblebrox:ccollect-0.2% cat conf/sources/testsource2/exclude
@@ -913,10 +959,10 @@ already print some statistics (though not all / the same as presented by
    something with spaces is not a problem

 

 
5.3.8. Detailed description of "intervals/"

-
When you create the subdirectory intervals/ in your source configuration
+
When you create the subdirectory intervals/ in your source configuration
 directory, you can specify individiual intervals for this specific source.
 Each file in this directory describes an interval.

-
Example:

+
Example:

 

 

 
   [11:37] zaphodbeeblebrox:ccollect-0.2% ls -l conf/sources/testsource2/intervals/
@@ -928,24 +974,24 @@ Each file in this directory describes an interval.

    20
 

 
5.3.9. Detailled description of "rsync_options"

-
When you create the file rsync_options in your source configuration,
+
When you create the file rsync_options in your source configuration,
 all the parameters in this file will be passed to rsync. This
 way you can pass additional options to rsync. For instance you can tell rsync
-to show progress ("—progress"), or which -password-file ("—password-file")
+to show progress ("--progress"), or which -password-file ("--password-file")
 to use for automatic backup over the rsync-protocol.

-
Example:

+
Example:

 

 

 
   [23:42] hydrogenium:ccollect-0.2% cat conf/sources/test_rsync/rsync_options
    --password-file=/home/user/backup/protected_password_file

 

 
5.3.10. Detailled description of "pre_exec" and "post_exec"

-
When you create pre_exec and / or post_exec in your source
+
When you create pre_exec and / or post_exec in your source
 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.

-
Example:

+
Example:

 

 

 
[13:09] hydrogenium:ccollect-0.3% cat conf/sources/with_exec/pre_exec
@@ -960,7 +1006,7 @@ df -h
 df -h

 

 
5.3.11. Detailed description of "delete_incomplete"

-
If you create the file delete_incomplete in a source specification directory,
+
If you create the file delete_incomplete in a source specification directory,
 ccollect will look for incomplete backups (when the whole ccollect process
 was interrupted) and remove them. Without this file ccollect will only warn
 the user.

@@ -968,7 +1014,7 @@ the user.

 
6. Hints

 

 
6.1. Smart logging

-
Since ccollect-0.6.1 you can use the ccollect-logwrapper.sh(1) for logging.
+
Since ccollect-0.6.1 you can use the ccollect-logwrapper.sh(1) for logging.
 You call it the same way you call ccollect.sh and it will create a
 logfile containing the output of ccollect.sh. For more information look
 at the manpage ccollect-logwrapper. The following is an example running
@@ -980,13 +1026,13 @@ ccollect-logwrapper.sh (11722): Starting with arguments: daily u0160.nshq.ch.net
 ccollect-logwrapper.sh (11722): Finished.
 

 
6.2. Using a different ssh port

-
Mostly easy is to use your ~/.ssh/config file:

+
Mostly easy is to use your ~/.ssh/config file:

 

 

 
host mx2.schottelius.org
    Port 2342

 

-
If you only use that port for backup only and normally want to use another port,
+
If you only use that port for backup only and normally want to use another port,
 you can add HostName and "HostKeyAlias" (if you also have different
 keys on the different ports):

 

@@ -1002,8 +1048,8 @@ Host bruehe
    HostKeyAlias bruehe.schottelius.org
 

 
6.3. Using source names or interval in pre_/post_exec scripts

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

-
    
+
    The pre-/post_exec scripts can access some internal variables from ccollect:
    
+
      
 
    • 
 
      
 INTERVAL: The interval specified on the command line
@@ -1027,11 +1073,11 @@ name: the name of the currently being backuped source (not available for
 
      • 
 
    
 
    6.4. Using rsync protocol without ssh
    
-
    When you have a computer with little computing power, it may be useful to use
+
    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
 rsync_options to specify a password file to use for automatic backup.
    
-
    Example:
    
+
    Example:
    
 
    
 
    
 
    backup:~# cat /etc/ccollect/sources/sample.backup.host.org/source
@@ -1043,10 +1089,10 @@ backup:~# cat /etc/ccollect/sources/sample.backup.host.org/rsync_options
 backup:~# cat /etc/ccollect/sources/sample.backup.host.org/rsync_password
 this_is_the_rsync_password
    
 
    
-
    This hint was reported by Daniel Aubry.
    
+
    This hint was reported by Daniel Aubry.
    
 
    6.5. Not excluding top-level directories
    
-
    When you exclude "/proc" or "/mnt" from your backup, you may run into
-trouble when you restore your backup. When you use "/proc/*" or "/mnt/*"
+
    When you exclude "/proc" or "/mnt" from your backup, you may run into
+trouble when you restore your backup. When you use "/proc/*" or "/mnt/\*"
 instead, ccollect will backup empty directories.
    
 
    
 
@@ -1054,19 +1100,19 @@ instead, ccollect will backup empty directories.
    Note
    
 
 
 
-
    When those directories contain hidden files
+
    When those directories contain hidden files
 (those beginning with a dot (.)),
 they will still be transferred!
    
 
    		
 
    
 
    
-
    This hint was reported by Marcus Wagner.
    
+
    This hint was reported by Marcus Wagner.
    
 
    6.6. Re-using already created rsync-backups
    
-
    If you used rsync directly before you use ccollect, you can
+
    If you used rsync directly before you use ccollect, you can
 use this old backup as initial backup for ccollect: You
 simply move it into a directory below the destination directory
 and name it "interval.0".
    
-
    Example:
    
+
    Example:
    
 
    
 
    
 
    backup:/home/backup/web1# ls
@@ -1081,14 +1127,14 @@ backup:/home/backup/web1# mv * daily.0 2>/dev/null
 backup:/home/backup/web1# ls
 daily.0
    
 
    
-
    Now you can use /home/backup/web1 as the destination for the backup.
    
+
    Now you can use /home/backup/web1 as the destination for the backup.
    
 
    
 
    
 
 
    Note
    
     		
 
-
    It does not matter anymore how you name your directory, as ccollect uses
+
    It does not matter anymore how you name your directory, as ccollect uses
 the -c option from ls to find out which directory to clone from.
    
 
    		
 
    
@@ -1099,7 +1145,7 @@ the -c option from ls to find out which directory to clone from.
    Note
    
 
 
-
    Older versions (pre 0.6, iirc) had a problem, if you named the first backup
+
    Older versions (pre 0.6, iirc) had a problem, if you named the first backup
 something like "daily.initial". It was needed to use the "0" (or some
 number that is lower than the current year) as extension. ccollect
 used sort to find the latest backup. ccollect itself uses
@@ -1113,9 +1159,9 @@ wasted resources, but your backup had beer complete anyway.
    
 
 
    
 
    6.7. Using pre_/post_exec
    
-
    Your pre_/post_exec script does not need to be a script, you can also
+
    Your pre_/post_exec script does not need to be a script, you can also
 use a link to
    
-
      
+
        
 
      • 
 
        
 an existing program
@@ -1127,40 +1173,40 @@ an already written script
 
        
 
        • 
 
      
-
      The only requirement is that it is executable.
      
+
      The only requirement is that it is executable.
      
 
      6.8. Using source specific interval definitions
      
-
      When you are backing up multiple hosts via cron each night, it may be
+
      When you are backing up multiple hosts via cron each night, it may be
 a problem that host "big_server" may only have 4 daily backups, because
 otherwise its backup device will be full. But for all other hosts
 you want to keep 20 daily backups. In this case you would create
 /etc/ccollect/default/intervals/daily containing "20" and
 /etc/ccollect/sources/big_server/intervals/daily containing "4".
      
-
      Source specific intervals always overwrite the default values.
+
      Source specific intervals always overwrite the default values.
 If you have to specify it individually for every host, because
 of different requirements, you can even omit creating
 /etc/ccollect/default/intervals/daily.
      
 
      6.9. Comparing backups
      
-
      If you want to see what changed between two backups, you can use
+
      If you want to see what changed between two backups, you can use
 rsync directly:
      
 
      
 
      
 
      [12:00] u0255:ddba034.netstream.ch#  rsync -n -a --delete --stats --progress daily.20080324-0313.17841/ daily.20080325-0313.31148/
      
 
      
-
      This results in a listing of changes. Because we pass -n to rsync no transfer
+
      This results in a listing of changes. Because we pass -n to rsync no transfer
 is made (i.e. report only mode)"
      
-
      This hint was reported by Daniel Aubry.
      
+
      This hint was reported by Daniel Aubry.
      
 
      6.10. Testing for host reachabilty
      
-
      If you want to test whether the host you try to backup is reachable, you can use
+
      If you want to test whether the host you try to backup is reachable, you can use
 the following script as source specific pre-exec:
      
 
      
 
      
 
      #!/bin/sh
 # ping -c1 -q `cat "/etc/ccollect/sources/$name/source" | cut -d"@" -f2 | cut -d":" -f1`
      
 
      
-
      This prevents the deletion of old backups, if the host is not reachable.
      
-
      This hint was reported by Daniel Aubry.
      
+
      This prevents the deletion of old backups, if the host is not reachable.
      
+
      This hint was reported by Daniel Aubry.
      
 
      6.11. Easy check for errors
      
-
      If you want to see whether there have been any errors while doing the backup,
+
      If you want to see whether there have been any errors while doing the backup,
 you can run ccollect together with ccollect_analyse_logs.sh:
      
 
      
 
      
@@ -1170,11 +1216,11 @@ you can run ccollect together with ccollect_analyse_logs.sh:7. F.A.Q.
 
      
 
      7.1. What happens if one backup is broken or empty?
      
-
      Let us assume that one backup failed (connection broke or the source
-hard disk had some failures). Therefore we've got one incomplete backup in our history.
      
-
      ccollect will transfer the missing files the next time you use it.
+
      Let us assume that one backup failed (connection broke or the source
+hard disk had some failures). Therefore we’ve got one incomplete backup in our history.
      
+
      ccollect will transfer the missing files the next time you use it.
 This leads to
      
-
        
+
          
 
        • 
 
          
 more transferred files
@@ -1186,24 +1232,24 @@ much greater disk space usage, as no hardlinks can be used
 
          
 
          • 
 
        
-
        If the whole ccollect process was interrupted, ccollect (since 0.6) can
+
        If the whole ccollect process was interrupted, ccollect (since 0.6) can
 detect that and remove the incomplete backups, so you can clone from a complete
 backup instead
        
 
        7.2. When backing up from localhost the destination is also included. Is this a bug?
        
-
        No. ccollect passes your source definition directly to rsync. It
+
        No. ccollect passes your source definition directly to rsync. It
 does not try to analyze it. So it actually does not know if a source
 comes from local harddisk or from a remote server. And it does not want
 to. When you backup from the local harddisk (which is perhaps not
 even a good idea when thinking of security), add the destination
 to source/exclude. (Daniel Aubry reported this problem)
        
 
        7.3. Why does ccollect say "Permission denied" with my pre-/postexec script?
        
-
        The most common error is that you have not given your script the correct
-permissions. Try chmod 0755 /etc/ccollect/sources/yoursource/*_exec`.
        
+
        The most common error is that you have not given your script the correct
+permissions. Try chmod 0755 /etc/ccollect/sources/'yoursource'/*_exec`.
        
 
        7.4. Why does the backup job fail when part of the source is a link?
        
-
        When a part of your path you specified in the source is a
+
        When a part of your path you specified in the source is a
 (symbolic, hard links are not possible for directories) link,
 the backup must fail.
        
-
        First of all, let us have a look at how it looks like:
        
+
        First of all, let us have a look at how it looks like:
        
 
        
 
        
 
        ==> ccollect 0.4: Beginning backup using interval taeglich <==
@@ -1216,7 +1262,7 @@ the backup must fail.
        
 [testsource] rsync: stat "/etc/ccollect/sources/testsource/destination/taeglich.2006-04-29-0001.3874/home/user/nico/projekte/ccollect" failed: No such file or directory (2)
 [...]
 
        
-
        So what is the problem? It is very obvious when you look deeper into it:
        
+
        So what is the problem? It is very obvious when you look deeper into it:
        
 
        
 
        
 
        % cat /etc/ccollect/sources/testsource/source
@@ -1226,17 +1272,17 @@ lrwxrwxrwx 1 nico nico 29 2005-12-02 23:28 /home/user/nico/projekte -> oeffen
 % ls -l /etc/ccollect/sources/testsource/destination/taeglich.2006-04-29-0001.3874/home/user/nico
 lrwxrwxrwx 1 nico nico 29 2006-04-29 00:01 projekte -> oeffentlich/computer/projekte
        
 
        
-
        rsync creates the directory structure before it creates the symbolic link.
+
        rsync creates the directory structure before it creates the symbolic link.
 This link now links to something not reachable (dead link). It is
 impossible to create subdirectories under the broken link.
        
-
        In conclusion you cannot use paths with a linked part.
        
-
        However, you can backup directories containing symbolic links
+
        In conclusion you cannot use paths with a linked part.
        
+
        However, you can backup directories containing symbolic links
 (in this case you could backup /home/user/nico, which contains
 /home/user/nico/projekte and oeffentlich/computer/projekte).
        
 
        7.5. How can I prevent missing the right time to enter my password?
        
-
        As ccollect first deletes the old backups, it may take some time
+
        As ccollect first deletes the old backups, it may take some time
 until rsync requests the password for the ssh session from you.
        
-
        The easiest way not to miss that point is running ccollect in screen,
+
        The easiest way not to miss that point is running ccollect in screen,
 which has the ability to monitor the output for activity. So as soon as
 your screen beeps, after ccollect began to remove the last directory,
 you can enter your password (have a look at screen(1), especially "C-a M"
@@ -1270,7 +1316,7 @@ srwali01:/etc/ccollect/sources/local-root# ccollect.sh taeglich local-root
 /=> Beginning to backup "local-root" ...
 |-> 0 backup(s) already exist, keeping 28 backup(s).
 
        
-
        After that, I added some more sources:
        
+
        After that, I added some more sources:
        
 
        
 
        
 
        srwali01:~# cd /etc/ccollect/sources
@@ -1319,7 +1365,7 @@ srwali01:/etc/ccollect/sources# du -sh /mnt/hdbackup/wl6/*
 147M    /mnt/hdbackup/wl6/taeglich.2005-12-08-14:42.312
 147M    /mnt/hdbackup/wl6/taeglich.2005-12-08-14:45.588
        
 
        
-
        The backup of our main fileserver:
        
+
        The backup of our main fileserver:
        
 
        
 
        
 
        backup:~# df -h /home/backup/srsyg01/
@@ -1341,7 +1387,7 @@ backup:~# du -sh /home/backup/srsyg01/*
 backup:~# du --version | head -n1
 du (coreutils) 5.2.1
        
 
        
-
        Newer versions of du also detect the hardlinks, so we can even compare
+
        Newer versions of du also detect the hardlinks, so we can even compare
 the sizes directly with du:
        
 
        
 
        
@@ -1358,10 +1404,10 @@ du (GNU coreutils) 5.93
 1.5G    hydrogenium/durcheinander.2006-01-25-23:18.31328
 200M    hydrogenium/durcheinander.2006-01-26-00:11.3332
 
        
-
        In the second report (without -l) the sizes include the space the inodes of
+
        In the second report (without -l) the sizes include the space the inodes of
 the hardlinks allocate.
        
 
        8.3. A collection of backups on the backup server
        
-
        All the data of my important hosts is backuped to eiche into
+
        All the data of my important hosts is backuped to eiche into
 /mnt/schwarzesloch/backup:
        
 
        
 
        
@@ -1386,7 +1432,7 @@ woechentlich.2006-02-06-08:22.15994  woechentlich.2006-03-02-23:00.17346
 woechentlich.2006-02-06-19:40.16321  woechentlich.2006-03-09-23:00.29317
 woechentlich.2006-02-12-11:51.2514   woechentlich.2006-03-16-23:00.4218
 
        
-
        And this incremental backup and the archive are copied to an external
+
        And this incremental backup and the archive are copied to an external
 usb harddisk (attention: you should really use -H to backup the backup):
        
 
        
 
        
@@ -1412,7 +1458,7 @@ rsync -av -H --delete /mnt/schwarzesloch/ "$DDIR/schwarzesloch/"
 rsync -av -H --delete /mnt/archiv/ "$DDIR/archiv/"
 
        
 
        8.4. Processes running when doing ccollect -p
        
-
        Truncated output from ps axuwwwf:
        
+
        Truncated output from ps axuwwwf:
        
 
        
 
        
 
           S+   11:40   0:00  |   |   |   \_ /bin/sh /usr/local/bin/ccollect.sh daily -p ddba034 ddba045 ddba046 ddba047 ddba049 ddna010 ddna011
@@ -1454,13 +1500,13 @@ rsync -av -H --delete /mnt/archiv/ "$DDIR/archiv/"
        
    S+   11:40   0:00  |   |   |           \_ /bin/sh /usr/local/bin/ccollect.sh daily ddna011
    S+   11:40   0:00  |   |   |               \_ sed s:^:\[ddna011\] :
 
        
-
        As you can see, six processes are deleting old backups, while one backup
+
        As you can see, six processes are deleting old backups, while one backup
 (ddba034) is already copying data.
        
 
        
 
 
diff --git a/software/ccollect/doc/ccollect.text b/software/ccollect/doc/ccollect.text
index 150803a9..29d7784a 100644
--- a/software/ccollect/doc/ccollect.text
+++ b/software/ccollect/doc/ccollect.text
@@ -23,6 +23,7 @@ Supported and tested operating systems and architectures
 
 - GNU/Linux on amd64/hppa/i386/ppc
 - FreeBSD   on amd64/i386
+- Mac OS X 10.5
 - NetBSD    on alpha/amd64/i386/sparc/sparc64
 - OpenBSD   on amd64
 
@@ -138,7 +139,7 @@ Quick start
 For those who do not want to read the whole long document:
 
 --------------------------------------------------------------------------------
-# get latest ccollect tarball from http://unix.schottelius.org/ccollect/
+# get latest ccollect tarball from http://www.nico.schottelius.org/software/ccollect/
 # replace value for CCV with the current version
 export CCV=0.7.1
 
@@ -146,7 +147,7 @@ export CCV=0.7.1
 # replace 'wget' with 'fetch' on bsd
 #
 holen=wget
-"$holen" http://unix.schottelius.org/ccollect/ccollect-${CCV}.tar.bz2
+"$holen" http://www.nico.schottelius.org/software/ccollect/ccollect-${CCV}.tar.bz2
 
 # extract the tarball, change to the newly created directory
 tar -xvjf ccollect-${CCV}.tar.bz2
@@ -211,7 +212,7 @@ Installing ccollect
 ~~~~~~~~~~~~~~~~~~~
 For the installation you need at least
 
-  - the latest ccollect package (http://unix.schottelius.org/ccollect/)
+  - the latest ccollect package (http://www.nico.schottelius.org/software/ccollect/)
   - either `cp` and `chmod` or `install`
   - for more comfort: `make`
   - for rebuilding the generated documentation: additionally `asciidoc`
diff --git a/software/ccollect/doc/man/ccollect.1 b/software/ccollect/doc/man/ccollect.1
index a483c14f..294f51c9 100644
--- a/software/ccollect/doc/man/ccollect.1
+++ b/software/ccollect/doc/man/ccollect.1
@@ -1,25 +1,33 @@
+'\" t
 .\"     Title: ccollect
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 
-.\"      Date: 03/17/2008
-.\"    Manual: 
-.\"    Source: 
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.1 
+.\"      Date: 07/01/2009
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
 .\"
-.TH "CCOLLECT" "1" "03/17/2008" "" ""
+.TH "CCOLLECT" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-ccollect - (pseudo) incremental backup with different exclude lists using hardlinks and rsync
+ccollect \- (pseudo) incremental backup with different exclude lists using hardlinks and rsync
 .SH "SYNOPSIS"
-\fIccollect\.sh\fR  [args] 
 .sp
+\fIccollect\&.sh\fR  [args] 
 .SH "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 \fIdash\fR, \fIksh\fR, \fIzsh\fR, \fIbash\fR, \&...)\.
 .sp
-For more information refer to the manual titled "ccollect \- Installing, Configuring and Using" (available as text (asciidoc), texinfo or html)\.
+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, \&...)\&.
 .sp
+For more information refer to the manual titled "ccollect \- Installing, Configuring and Using" (available as text (asciidoc), texinfo or html)\&.
 .SH "OPTIONS"
 .PP
 \-h, \-\-help
@@ -39,23 +47,17 @@ 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
 .SH "SEE ALSO"
+.sp
 ccollect_add_source(1), ccollect_analyse_logs(1), ccollect_logwrapper(1) ccollect_delete_source(1), ccollect_list_intervals(1)
-.sp
 .SH "AUTHOR"
-Nico Schottelius 
 .sp
+Nico Schottelius 
 .SH "RESOURCES"
-Main web site: http://unix\.schottelius\.org/ccollect/
 .sp
+Main web site: http://www\&.nico\&.schottelius\&.org/software/ccollect/
 .SH "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)\.
 .sp
-.SH "NOTES"
-.IP " 1." 4
-nico-ccollect--@--schottelius.org
-.RS 4
-\%mailto:nico-ccollect--@--schottelius.org
-.RE
+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.htm b/software/ccollect/doc/man/ccollect.htm
index c2bf2350..ca2931ed 100644
--- a/software/ccollect/doc/man/ccollect.htm
+++ b/software/ccollect/doc/man/ccollect.htm
@@ -1,23 +1,23 @@
-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 <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),
-texinfo or html).
        OPTIONS
        
--h, —help
+texinfo or html).
        OPTIONS
        
+-h, --help
 
        
    Show the help screen
 
        
--p, —parallel
+-p, --parallel
 
        
    Parallelise backup processes
 
        
--a, —all
+-a, --all
 
        
    Backup all sources specified in /etc/ccollect/sources
 
        
--v, —verbose
+-v, --verbose
 
        
    Be very verbose (uses set -x).
-
        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://unix.schottelius.org/ccollect/
        COPYING
        Copyright (C) 2006-2008 Nico Schottelius. Free use of this software is
+
        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 500d238d..3db98766 100644
--- a/software/ccollect/doc/man/ccollect.html
+++ b/software/ccollect/doc/man/ccollect.html
@@ -3,7 +3,8 @@
 
 
 
-
+
+ccollect(1)
 
-ccollect(1)
 
 
 
 
        1. NAME
        
 
        
-
        ccollect - (pseudo) incremental backup with different exclude lists using hardlinks and rsync
        
+
        ccollect - (pseudo) incremental backup with different exclude lists using hardlinks and rsync
        
 
        
 
        2. SYNOPSIS
        
 
        
-
        ccollect.sh <interval name> [args] <sources to backup>
        
+
        ccollect.sh <interval name> [args] <sources to backup>
        
 
        
 
        3. DESCRIPTION
        
 
        
-
        ccollect is a backup utility written in the sh-scripting language.
+
        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
+
        For more information refer to the manual titled
 "ccollect - Installing, Configuring and Using" (available as text (asciidoc),
 texinfo or html).
        
 
        
 
        4. OPTIONS
        
 
        
-
        
-
        
--h, —help
+
        
+
        
+-h, --help
 
        
 
        
 
        
    Show the help screen
 
        
 
        
-
        
--p, —parallel
+
        
+-p, --parallel
 
        
 
        
 
        
    Parallelise backup processes
 
        
 
        
-
        
--a, —all
+
        
+-a, --all
 
        
 
        
 
        
    Backup all sources specified in /etc/ccollect/sources
 
        
 
        
-
        
--v, —verbose
+
        
+-v, --verbose
 
        
 
        
 
        
@@ -367,25 +444,25 @@ texinfo or html).
        
 
        
 
        5. SEE ALSO
        
 
        
-
        ccollect_add_source(1), ccollect_analyse_logs(1), ccollect_logwrapper(1)
+
        ccollect_add_source(1), ccollect_analyse_logs(1), ccollect_logwrapper(1)
 ccollect_delete_source(1), ccollect_list_intervals(1)
        
 
        
 
        6. AUTHOR
        
 
        
-
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        
+
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        
 
        
 
        7. RESOURCES
        
 
        
-
        Main web site: http://unix.schottelius.org/ccollect/
        
+
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        
 
        
 
        8. COPYING
        
 
        
-
        Copyright (C) 2006-2008 Nico Schottelius. Free use of this software is
+
        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.text b/software/ccollect/doc/man/ccollect.text
index d824717c..84e95bb0 100644
--- a/software/ccollect/doc/man/ccollect.text
+++ b/software/ccollect/doc/man/ccollect.text
@@ -52,7 +52,7 @@ Nico Schottelius 
 
 RESOURCES
 ---------
-Main web site: http://unix.schottelius.org/ccollect/[]
+Main web site: http://www.nico.schottelius.org/software/ccollect/[]
 
 
 COPYING
diff --git a/software/ccollect/doc/man/ccollect_add_source.1 b/software/ccollect/doc/man/ccollect_add_source.1
index 6406a555..59ccc439 100644
--- a/software/ccollect/doc/man/ccollect_add_source.1
+++ b/software/ccollect/doc/man/ccollect_add_source.1
@@ -1,44 +1,52 @@
+'\" t
 .\"     Title: ccollect_add_source
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 
-.\"      Date: 03/17/2008
-.\"    Manual: 
-.\"    Source: 
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.1 
+.\"      Date: 07/01/2009
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
 .\"
-.TH "CCOLLECT_ADD_SOURCE" "1" "03/17/2008" "" ""
+.TH "CCOLLECT_ADD_SOURCE" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-ccollect_add_source - create new source for ccollect(1)
+ccollect_add_source \- create new source for ccollect(1)
 .SH "SYNOPSIS"
-\fIccollect_add_source\.sh\fR 
 .sp
+\fIccollect_add_source\&.sh\fR 
 .SH "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 \fI$CCOLLECT_CONF/sources\fR\. It is designed to run on a backup server to create new directories for new hosts\.
 .sp
+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 \fI$CCOLLECT_CONF/sources\fR\&. It is designed to run on a backup server to create new directories for new hosts\&.
 .SH "FILES"
 .PP
 $CCOLLECT_CONF/defaults/sources
 .RS 4
-Main configuration directory\. $CCOLLECT_CONF is
-\fI/etc/ccollect\fR, if unset\. All the following files reside below this directory\.
+Main configuration directory\&. $CCOLLECT_CONF is
+\fI/etc/ccollect\fR, if unset\&. All the following files reside below this directory\&.
 .RE
 .PP
 exclude, summary, intervals, pre_exec, post_exec, rsync_options, verbose, very_verbose
 .RS 4
-Those are the standard configuration files known by ccollect(1)\. If the file exist it will be copied to the newly created source\. Directories (\fIintervals\fR) are copied recursively\.
+Those are the standard configuration files known by ccollect(1)\&. If the file exist it will be copied to the newly created source\&. Directories (\fIintervals\fR) are copied recursively\&.
 .RE
 .PP
 destination_base
 .RS 4
-A link to the directory where to store the backups\. Below this directory
-ccollect_add_source\.sh
-will create a directory with the hostname you specified on the command line\. A common valua for
+A link to the directory where to store the backups\&. Below this directory
+ccollect_add_source\&.sh
+will create a directory with the hostname you specified on the command line\&. A common valua for
 destination_base
 is
-\fI/home/server/backup\fR\.
+\fI/home/server/backup\fR\&.
 .RE
 .PP
 source_prefix, source_postfix
@@ -47,30 +55,24 @@ source_prefix, source_postfix
 source_prefix
 is put before the hostname,
 source_postfix
-is appended after it\. A common value for
+is appended after it\&. A common value for
 source_prefix
 maybe
 \fIroot@\fR
 and
 \fI:/\fR
 for
-source_postfix\.
+source_postfix\&.
 .RE
 .SH "SEE ALSO"
-ccollect(1), ccollect_analyse_logs\.sh, ccollect_delete_source(1), ccollect_list_intervals(1), ccollect_logwrapper(1),
 .sp
+ccollect(1), ccollect_analyse_logs\&.sh, ccollect_delete_source(1), ccollect_list_intervals(1), ccollect_logwrapper(1),
 .SH "AUTHOR"
-Nico Schottelius 
 .sp
+Nico Schottelius 
 .SH "RESOURCES"
-Main web site: http://unix\.schottelius\.org/ccollect/
 .sp
+Main web site: http://www\&.nico\&.schottelius\&.org/software/ccollect/
 .SH "COPYING"
-Copyright (C) 2007\-2008 Nico Schottelius\. Free use of this software is granted under the terms of the GNU General Public License Version 3 (GPLv3)\.
 .sp
-.SH "NOTES"
-.IP " 1." 4
-nico-ccollect--@--schottelius.org
-.RS 4
-\%mailto:nico-ccollect--@--schottelius.org
-.RE
+Copyright (C) 2007\-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_add_source.htm b/software/ccollect/doc/man/ccollect_add_source.htm
index 6b1e1cb0..858f607b 100644
--- a/software/ccollect/doc/man/ccollect_add_source.htm
+++ b/software/ccollect/doc/man/ccollect_add_source.htm
@@ -1,7 +1,7 @@
-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
        
+new directories for new hosts.
        FILES
        
 $CCOLLECT_CONF/defaults/sources
 
        
    Main configuration directory. $CCOLLECT_CONF is /etc/ccollect, if unset.
@@ -41,6 +41,6 @@ source_postfix
    source_prefix is put before the hostname, source_postfix is appended
    after it. A common value for source_prefix maybe root@ and :/
    for source_postfix.
-
        SEE ALSO
        ccollect(1), ccollect_analyse_logs.sh, ccollect_delete_source(1),
-ccollect_list_intervals(1), ccollect_logwrapper(1),
        AUTHOR
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        RESOURCES
        Main web site: http://unix.schottelius.org/ccollect/
        COPYING
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        SEE ALSO
        ccollect(1), ccollect_analyse_logs.sh, ccollect_delete_source(1),
+ccollect_list_intervals(1), ccollect_logwrapper(1),
        AUTHOR
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        RESOURCES
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        COPYING
        Copyright (C) 2007-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_add_source.html b/software/ccollect/doc/man/ccollect_add_source.html
index bd87bc1c..dd3c2909 100644
--- a/software/ccollect/doc/man/ccollect_add_source.html
+++ b/software/ccollect/doc/man/ccollect_add_source.html
@@ -3,7 +3,8 @@
 
 
 
-
+
+ccollect_add_source(1)
 
-ccollect_add_source(1)
 
 
 
 
        1. NAME
        
 
        
-
        ccollect_add_source - create new source for ccollect(1)
        
+
        ccollect_add_source - create new source for ccollect(1)
        
 
        
 
        2. SYNOPSIS
        
 
        
-
        ccollect_add_source.sh <hostnames to create sources for>
        
+
        ccollect_add_source.sh <hostnames to create sources for>
        
 
        
 
        3. DESCRIPTION
        
 
        
-
        ccollect_add_source.sh creates a new backup source for use with ccollect(1).
+
        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.
        
 
        
 
        4. FILES
        
 
        
-
        
-
        
+
        
+
        
 $CCOLLECT_CONF/defaults/sources
 
        
 
        
@@ -338,28 +415,28 @@ $CCOLLECT_CONF/defaults/sources
    All the following files reside below this directory.
 
        
 
        
-
        
+
        
 exclude
 
        
-
        
+
        
 summary
 
        
-
        
+
        
 intervals
 
        
-
        
+
        
 pre_exec
 
        
-
        
+
        
 post_exec
 
        
-
        
+
        
 rsync_options
 
        
-
        
+
        
 verbose
 
        
-
        
+
        
 very_verbose
 
        
 
        
@@ -369,7 +446,7 @@ very_verbose
    Directories (intervals) are copied recursively.
 
        
 
        
-
        
+
        
 destination_base
 
        
 
        
@@ -380,10 +457,10 @@ destination_base
    /home/server/backup.
 
        
 
        
-
        
+
        
 source_prefix
 
        
-
        
+
        
 source_postfix
 
        
 
        
@@ -397,25 +474,25 @@ source_postfix
 
        
 
        5. SEE ALSO
        
 
        
-
        ccollect(1), ccollect_analyse_logs.sh, ccollect_delete_source(1),
+
        ccollect(1), ccollect_analyse_logs.sh, ccollect_delete_source(1),
 ccollect_list_intervals(1), ccollect_logwrapper(1),
        
 
        
 
        6. AUTHOR
        
 
        
-
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        
+
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        
 
        
 
        7. RESOURCES
        
 
        
-
        Main web site: http://unix.schottelius.org/ccollect/
        
+
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        
 
        
 
        8. COPYING
        
 
        
-
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        Copyright (C) 2007-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_add_source.text b/software/ccollect/doc/man/ccollect_add_source.text
index 25e58a37..e3b9f83c 100644
--- a/software/ccollect/doc/man/ccollect_add_source.text
+++ b/software/ccollect/doc/man/ccollect_add_source.text
@@ -66,7 +66,7 @@ Nico Schottelius 
 
 RESOURCES
 ---------
-Main web site: http://unix.schottelius.org/ccollect/[]
+Main web site: http://www.nico.schottelius.org/software/ccollect/[]
 
 
 COPYING
diff --git a/software/ccollect/doc/man/ccollect_analyse_logs.1 b/software/ccollect/doc/man/ccollect_analyse_logs.1
index 3f1c6a30..a7d77358 100644
--- a/software/ccollect/doc/man/ccollect_analyse_logs.1
+++ b/software/ccollect/doc/man/ccollect_analyse_logs.1
@@ -1,23 +1,31 @@
+'\" t
 .\"     Title: ccollect_analyse_logs
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 
-.\"      Date: 03/17/2008
-.\"    Manual: 
-.\"    Source: 
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.1 
+.\"      Date: 07/01/2009
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
 .\"
-.TH "CCOLLECT_ANALYSE_LOG" "1" "03/17/2008" "" ""
+.TH "CCOLLECT_ANALYSE_LOG" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-ccollect_analyse_logs - analyse logs produced by ccollect(1)
+ccollect_analyse_logs \- analyse logs produced by ccollect(1)
 .SH "SYNOPSIS"
-\fIccollect_analyse_logs\.sh\fR [iwe]
 .sp
+\fIccollect_analyse_logs\&.sh\fR [iwe]
 .SH "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\.
 .sp
+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\&.
 .SH "FILES"
 .PP
 ccollect log files
@@ -26,30 +34,24 @@ Are read from stdin
 .RE
 .SH "EXAMPLES"
 .PP
-cat /var/log/ccollect/single/* | ccollect_analyse_logs\.sh iw
+cat /var/log/ccollect/single/* | ccollect_analyse_logs\&.sh iw
 .RS 4
 Displays warnings and informational parts
 .RE
 .PP
-ccollect_analyse_logs\.sh iw < /var/log/ccollect/all_together
+ccollect_analyse_logs\&.sh iw < /var/log/ccollect/all_together
 .RS 4
 Displays only error messages (useful for the morning mail)
 .RE
 .SH "SEE ALSO"
-ccollect(1), ccollect_add_source\.sh, ccollect_delete_source(1), ccollect_list_intervals(1), ccollect_logwrapper(1),
 .sp
+ccollect(1), ccollect_add_source\&.sh, ccollect_delete_source(1), ccollect_list_intervals(1), ccollect_logwrapper(1),
 .SH "AUTHOR"
-Nico Schottelius 
 .sp
+Nico Schottelius 
 .SH "RESOURCES"
-Main web site: http://unix\.schottelius\.org/ccollect/
 .sp
+Main web site: http://www\&.nico\&.schottelius\&.org/software/ccollect/
 .SH "COPYING"
-Copyright (C) 2007\-2008 Nico Schottelius\. Free use of this software is granted under the terms of the GNU General Public License Version 3 (GPLv3)\.
 .sp
-.SH "NOTES"
-.IP " 1." 4
-nico-ccollect--@--schottelius.org
-.RS 4
-\%mailto:nico-ccollect--@--schottelius.org
-.RE
+Copyright (C) 2007\-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_analyse_logs.htm b/software/ccollect/doc/man/ccollect_analyse_logs.htm
index 72803e21..f00a8d1c 100644
--- a/software/ccollect/doc/man/ccollect_analyse_logs.htm
+++ b/software/ccollect/doc/man/ccollect_analyse_logs.htm
@@ -1,10 +1,10 @@
-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
        
+combination of them is allowed.
        FILES
        
 ccollect log files
 
        
    Are read from stdin
-
        EXAMPLES
        
+
        EXAMPLES
        
 cat /var/log/ccollect/single/* | ccollect_analyse_logs.sh iw
 
        
    Displays warnings and informational parts
@@ -12,6 +12,6 @@ cat /var/log/ccollect/single/* | ccollect_analyse_logs.sh iw
 ccollect_analyse_logs.sh iw < /var/log/ccollect/all_together
 
        
    Displays only error messages (useful for the morning mail)
-
        SEE ALSO
        ccollect(1), ccollect_add_source.sh, ccollect_delete_source(1),
-ccollect_list_intervals(1), ccollect_logwrapper(1),
        AUTHOR
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        RESOURCES
        Main web site: http://unix.schottelius.org/ccollect/
        COPYING
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        SEE ALSO
        ccollect(1), ccollect_add_source.sh, ccollect_delete_source(1),
+ccollect_list_intervals(1), ccollect_logwrapper(1),
        AUTHOR
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        RESOURCES
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        COPYING
        Copyright (C) 2007-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_analyse_logs.html b/software/ccollect/doc/man/ccollect_analyse_logs.html
index c7a6e7c1..d370e3b8 100644
--- a/software/ccollect/doc/man/ccollect_analyse_logs.html
+++ b/software/ccollect/doc/man/ccollect_analyse_logs.html
@@ -3,7 +3,8 @@
 
 
 
-
+
+ccollect_analyse_logs(1)
 
-ccollect_analyse_logs(1)
 
 
 
 
        1. NAME
        
 
        
-
        ccollect_analyse_logs - analyse logs produced by ccollect(1)
        
+
        ccollect_analyse_logs - analyse logs produced by ccollect(1)
        
 
        
 
        2. SYNOPSIS
        
 
        
-
        ccollect_analyse_logs.sh [iwe]
        
+
        ccollect_analyse_logs.sh [iwe]
        
 
        
 
        3. DESCRIPTION
        
 
        
-
        ccollect_analyse_logs.sh reads the logfiles from stdin. You have to specify
+
        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.
        
 
        
 
        4. FILES
        
 
        
-
        
-
        
+
        
+
        
 ccollect log files
 
        
 
        
@@ -340,8 +417,8 @@ ccollect log files
 
        
 
        5. EXAMPLES
        
 
        
-
        
-
        
+
        
+
        
 cat /var/log/ccollect/single/* | ccollect_analyse_logs.sh iw
 
        
 
        
@@ -349,7 +426,7 @@ cat /var/log/ccollect/single/* | ccollect_analyse_logs.sh iw
    Displays warnings and informational parts
 
        
 
        
-
        
+
        
 ccollect_analyse_logs.sh iw < /var/log/ccollect/all_together
 
        
 
        
@@ -361,25 +438,25 @@ ccollect_analyse_logs.sh iw < /var/log/ccollect/all_together
 
        
 
        6. SEE ALSO
        
 
        
-
        ccollect(1), ccollect_add_source.sh, ccollect_delete_source(1),
+
        ccollect(1), ccollect_add_source.sh, ccollect_delete_source(1),
 ccollect_list_intervals(1), ccollect_logwrapper(1),
        
 
        
 
        7. AUTHOR
        
 
        
-
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        
+
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        
 
        
 
        8. RESOURCES
        
 
        
-
        Main web site: http://unix.schottelius.org/ccollect/
        
+
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        
 
        
 
        9. COPYING
        
 
        
-
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        Copyright (C) 2007-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_analyse_logs.text b/software/ccollect/doc/man/ccollect_analyse_logs.text
index 26380142..659ddbf4 100644
--- a/software/ccollect/doc/man/ccollect_analyse_logs.text
+++ b/software/ccollect/doc/man/ccollect_analyse_logs.text
@@ -47,7 +47,7 @@ Nico Schottelius 
 
 RESOURCES
 ---------
-Main web site: http://unix.schottelius.org/ccollect/[]
+Main web site: http://www.nico.schottelius.org/software/ccollect/[]
 
 
 COPYING
diff --git a/software/ccollect/doc/man/ccollect_delete_source.1 b/software/ccollect/doc/man/ccollect_delete_source.1
index 7b1568eb..f9f25120 100644
--- a/software/ccollect/doc/man/ccollect_delete_source.1
+++ b/software/ccollect/doc/man/ccollect_delete_source.1
@@ -1,48 +1,50 @@
+'\" t
 .\"     Title: ccollect_delete_source
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 
-.\"      Date: 03/17/2008
-.\"    Manual: 
-.\"    Source: 
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.1 
+.\"      Date: 07/01/2009
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
 .\"
-.TH "CCOLLECT_DELETE_SOUR" "1" "03/17/2008" "" ""
+.TH "CCOLLECT_DELETE_SOUR" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-ccollect_delete_source - delete sources from ccollect(1)
+ccollect_delete_source \- delete sources from ccollect(1)
 .SH "SYNOPSIS"
-\fIccollect_delete_source\.sh\fR [\-d] [\-f] 
 .sp
+\fIccollect_delete_source\&.sh\fR [\-d] [\-f] 
 .SH "DESCRIPTION"
-ccollect_delete_source\.sh deletes backup sources from ccollect(1) and optional also the backups created for that source\.
 .sp
+ccollect_delete_source\&.sh deletes backup sources from ccollect(1) and optional also the backups created for that source\&.
 .SH "OPTIONS"
-\-d: Delete also the destination directory\. add_ccollect_source\.sh will change to the source/\fIname\fR/destination directory, get the absolute name and delete it recursively\. \-f: Force deletion\. Do not ask\. Very handy for people who know what they do\. Very dangerous for everyone else\.
 .sp
+\-d: Delete also the destination directory\&. add_ccollect_source\&.sh will change to the source/\fIname\fR/destination directory, get the absolute name and delete it recursively\&. \-f: Force deletion\&. Do not ask\&. Very handy for people who know what they do\&. Very dangerous for everyone else\&.
 .SH "FILES"
 .PP
 $CCOLLECT_CONF/sources
 .RS 4
-Directory containing the sources\. $CCOLLECT_CONF is
-\fI/etc/ccollect\fR, if unset\.
+Directory containing the sources\&. $CCOLLECT_CONF is
+\fI/etc/ccollect\fR, if unset\&.
 .RE
 .SH "SEE ALSO"
+.sp
 ccollect(1), ccollect_add_source(1), ccollect_add_source(1), ccollect_logwrapper(1), ccollect_list_intervals(1)
-.sp
 .SH "AUTHOR"
-Nico Schottelius 
 .sp
+Nico Schottelius 
 .SH "RESOURCES"
-Main web site: http://unix\.schottelius\.org/ccollect/
 .sp
+Main web site: http://www\&.nico\&.schottelius\&.org/software/ccollect/
 .SH "COPYING"
-Copyright (C) 2007\-2008 Nico Schottelius\. Free use of this software is granted under the terms of the GNU General Public License Version 3 (GPLv3)\.
 .sp
-.SH "NOTES"
-.IP " 1." 4
-nico-ccollect--@--schottelius.org
-.RS 4
-\%mailto:nico-ccollect--@--schottelius.org
-.RE
+Copyright (C) 2007\-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_delete_source.htm b/software/ccollect/doc/man/ccollect_delete_source.htm
index 6bba219e..f2deb1ce 100644
--- a/software/ccollect/doc/man/ccollect_delete_source.htm
+++ b/software/ccollect/doc/man/ccollect_delete_source.htm
@@ -1,14 +1,14 @@
-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:
+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
    it recursively.
 -f:
    Force deletion. Do not ask. Very handy for people who know what they do.
-   Very dangerous for everyone else.
        FILES
        
+   Very dangerous for everyone else.
        FILES
        
 $CCOLLECT_CONF/sources
 
        
    Directory containing the sources. $CCOLLECT_CONF is /etc/ccollect, if unset.
-
        SEE ALSO
        ccollect(1), ccollect_add_source(1), ccollect_add_source(1),
-ccollect_logwrapper(1), ccollect_list_intervals(1)
        AUTHOR
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        RESOURCES
        Main web site: http://unix.schottelius.org/ccollect/
        COPYING
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        SEE ALSO
        ccollect(1), ccollect_add_source(1), ccollect_add_source(1),
+ccollect_logwrapper(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) 2007-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_delete_source.html b/software/ccollect/doc/man/ccollect_delete_source.html
index 59e42c12..a66b04ab 100644
--- a/software/ccollect/doc/man/ccollect_delete_source.html
+++ b/software/ccollect/doc/man/ccollect_delete_source.html
@@ -3,7 +3,8 @@
 
 
 
-
+
+ccollect_delete_source(1)
 
-ccollect_delete_source(1)
 
 
 
 
        1. NAME
        
 
        
-
        ccollect_delete_source - delete sources from ccollect(1)
        
+
        ccollect_delete_source - delete sources from ccollect(1)
        
 
        
 
        2. SYNOPSIS
        
 
        
-
        ccollect_delete_source.sh [-d] [-f] <hostnames to create sources for>
        
+
        ccollect_delete_source.sh [-d] [-f] <hostnames to create sources for>
        
 
        
 
        3. DESCRIPTION
        
 
        
-
        ccollect_delete_source.sh deletes backup sources from ccollect(1) and optional
+
        ccollect_delete_source.sh deletes backup sources from ccollect(1) and optional
 also the backups created for that source.
        
 
        
 
        4. OPTIONS
        
 
        
-
        -d:
+
        -d:
    Delete also the destination directory. add_ccollect_source.sh will change
    to the source/name/destination directory, get the absolute name and delete
    it recursively.
@@ -336,8 +413,8 @@ also the backups created for that source.
        
 
        
 
        5. FILES
        
 
        
-
        
-
        
+
        
+
        
 $CCOLLECT_CONF/sources
 
        
 
        
@@ -349,25 +426,25 @@ $CCOLLECT_CONF/sources
 
        
 
        6. SEE ALSO
        
 
        
-
        ccollect(1), ccollect_add_source(1), ccollect_add_source(1),
+
        ccollect(1), ccollect_add_source(1), ccollect_add_source(1),
 ccollect_logwrapper(1), ccollect_list_intervals(1)
        
 
        
 
        7. AUTHOR
        
 
        
-
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        
+
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        
 
        
 
        8. RESOURCES
        
 
        
-
        Main web site: http://unix.schottelius.org/ccollect/
        
+
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        
 
        
 
        9. COPYING
        
 
        
-
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        Copyright (C) 2007-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_delete_source.text b/software/ccollect/doc/man/ccollect_delete_source.text
index 96562713..2b7f3000 100644
--- a/software/ccollect/doc/man/ccollect_delete_source.text
+++ b/software/ccollect/doc/man/ccollect_delete_source.text
@@ -48,7 +48,7 @@ Nico Schottelius 
 
 RESOURCES
 ---------
-Main web site: http://unix.schottelius.org/ccollect/[]
+Main web site: http://www.nico.schottelius.org/software/ccollect/[]
 
 
 COPYING
diff --git a/software/ccollect/doc/man/ccollect_list_intervals.1 b/software/ccollect/doc/man/ccollect_list_intervals.1
index f8ce76b5..eccd687c 100644
--- a/software/ccollect/doc/man/ccollect_list_intervals.1
+++ b/software/ccollect/doc/man/ccollect_list_intervals.1
@@ -1,45 +1,47 @@
+'\" t
 .\"     Title: ccollect_list_intervals
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 
-.\"      Date: 03/17/2008
-.\"    Manual: 
-.\"    Source: 
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.1 
+.\"      Date: 07/01/2009
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
 .\"
-.TH "CCOLLECT_LIST_INTERV" "1" "03/17/2008" "" ""
+.TH "CCOLLECT_LIST_INTERV" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-ccollect_list_intervals - list available intervals from ccollect(1)
+ccollect_list_intervals \- list available intervals from ccollect(1)
 .SH "SYNOPSIS"
-\fIccollect_list_intervals\.sh\fR
 .sp
+\fIccollect_list_intervals\&.sh\fR
 .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\.
 .sp
+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\&.
 .SH "FILES"
 .PP
 $CCOLLECT_CONF/intervals
 .RS 4
-Directory containing the intervals\. $CCOLLECT_CONF is
-\fI/etc/ccollect\fR, if unset\.
+Directory containing the intervals\&. $CCOLLECT_CONF is
+\fI/etc/ccollect\fR, if unset\&.
 .RE
 .SH "SEE ALSO"
+.sp
 collect(1), ccollect_add_source(1), ccollect_analyse_logs(1), ccollect_delete_source(1), ccollect_logwrapper(1)
-.sp
 .SH "AUTHOR"
-Nico Schottelius 
 .sp
+Nico Schottelius 
 .SH "RESOURCES"
-Main web site: http://unix\.schottelius\.org/ccollect/
 .sp
+Main web site: http://www\&.nico\&.schottelius\&.org/software/ccollect/
 .SH "COPYING"
-Copyright (C) 2007\-2008 Nico Schottelius\. Free use of this software is granted under the terms of the GNU General Public License Version 3 (GPLv3)\.
 .sp
-.SH "NOTES"
-.IP " 1." 4
-nico-ccollect--@--schottelius.org
-.RS 4
-\%mailto:nico-ccollect--@--schottelius.org
-.RE
+Copyright (C) 2007\-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_list_intervals.htm b/software/ccollect/doc/man/ccollect_list_intervals.htm
index 4e476499..c2fdd5fd 100644
--- a/software/ccollect/doc/man/ccollect_list_intervals.htm
+++ b/software/ccollect/doc/man/ccollect_list_intervals.htm
@@ -1,9 +1,9 @@
-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
        
+followed by the number backups to keep.
        FILES
        
 $CCOLLECT_CONF/intervals
 
        
    Directory containing the intervals. $CCOLLECT_CONF is /etc/ccollect, if unset.
-
        SEE ALSO
        collect(1), ccollect_add_source(1), ccollect_analyse_logs(1),
-ccollect_delete_source(1), ccollect_logwrapper(1)
        AUTHOR
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        RESOURCES
        Main web site: http://unix.schottelius.org/ccollect/
        COPYING
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        SEE ALSO
        collect(1), ccollect_add_source(1), ccollect_analyse_logs(1),
+ccollect_delete_source(1), ccollect_logwrapper(1)
        AUTHOR
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        RESOURCES
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        COPYING
        Copyright (C) 2007-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_list_intervals.html b/software/ccollect/doc/man/ccollect_list_intervals.html
index 59209209..463560e5 100644
--- a/software/ccollect/doc/man/ccollect_list_intervals.html
+++ b/software/ccollect/doc/man/ccollect_list_intervals.html
@@ -3,7 +3,8 @@
 
 
 
-
+
+ccollect_list_intervals(1)
 
-ccollect_list_intervals(1)
 
 
 
 
        1. NAME
        
 
        
-
        ccollect_list_intervals - list available intervals from ccollect(1)
        
+
        ccollect_list_intervals - list available intervals from ccollect(1)
        
 
        
 
        2. SYNOPSIS
        
 
        
-
        ccollect_list_intervals.sh
        
+
        ccollect_list_intervals.sh
        
 
        
 
        3. DESCRIPTION
        
 
        
-
        ccollect_list_intervals.sh shows intervals specified in the configuration
+
        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.
        
 
        
 
        4. FILES
        
 
        
-
        
-
        
+
        
+
        
 $CCOLLECT_CONF/intervals
 
        
 
        
@@ -340,25 +417,25 @@ $CCOLLECT_CONF/intervals
 
        
 
        5. SEE ALSO
        
 
        
-
        collect(1), ccollect_add_source(1), ccollect_analyse_logs(1),
+
        collect(1), ccollect_add_source(1), ccollect_analyse_logs(1),
 ccollect_delete_source(1), ccollect_logwrapper(1)
        
 
        
 
        6. AUTHOR
        
 
        
-
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        
+
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        
 
        
 
        7. RESOURCES
        
 
        
-
        Main web site: http://unix.schottelius.org/ccollect/
        
+
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        
 
        
 
        8. COPYING
        
 
        
-
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        Copyright (C) 2007-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_list_intervals.text b/software/ccollect/doc/man/ccollect_list_intervals.text
index 051b087c..9df4121b 100644
--- a/software/ccollect/doc/man/ccollect_list_intervals.text
+++ b/software/ccollect/doc/man/ccollect_list_intervals.text
@@ -39,7 +39,7 @@ Nico Schottelius 
 
 RESOURCES
 ---------
-Main web site: http://unix.schottelius.org/ccollect/[]
+Main web site: http://www.nico.schottelius.org/software/ccollect/[]
 
 
 COPYING
diff --git a/software/ccollect/doc/man/ccollect_logwrapper.1 b/software/ccollect/doc/man/ccollect_logwrapper.1
index 573cbe28..7a986480 100644
--- a/software/ccollect/doc/man/ccollect_logwrapper.1
+++ b/software/ccollect/doc/man/ccollect_logwrapper.1
@@ -1,32 +1,40 @@
+'\" t
 .\"     Title: ccollect_logwrapper
-.\"    Author: 
-.\" Generator: DocBook XSL Stylesheets v1.73.2 
-.\"      Date: 03/17/2008
-.\"    Manual: 
-.\"    Source: 
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.1 
+.\"      Date: 07/01/2009
+.\"    Manual: [FIXME: manual]
+.\"    Source: [FIXME: source]
+.\"  Language: English
 .\"
-.TH "CCOLLECT_LOGWRAPPER" "1" "03/17/2008" "" ""
+.TH "CCOLLECT_LOGWRAPPER" "1" "07/01/2009" "[FIXME: source]" "[FIXME: manual]"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
 .ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-ccollect_logwrapper - start ccollect(1) and create a unique logfile
+ccollect_logwrapper \- start ccollect(1) and create a unique logfile
 .SH "SYNOPSIS"
-\fIccollect_logwrapper\.sh\fR 
 .sp
+\fIccollect_logwrapper\&.sh\fR 
 .SH "DESCRIPTION"
-ccollect_logwrapper\.sh creates a unique logfile below \fI$CCOLLECT_CONF/logwrapper\fR and redirects ccollect(1) output (stdout and stderr) to it\.
 .sp
+ccollect_logwrapper\&.sh creates a unique logfile below \fI$CCOLLECT_CONF/logwrapper\fR and redirects ccollect(1) output (stdout and stderr) to it\&.
 .SH "OPTIONS"
-Options are passed directly to ccollect(1)\.
 .sp
+Options are passed directly to ccollect(1)\&.
 .SH "FILES"
 .PP
 $CCOLLECT_CONF/logwrapper
 .RS 4
-Directory containing the configuration\. $CCOLLECT_CONF is
-\fI/etc/ccollect\fR, if unset\.
+Directory containing the configuration\&. $CCOLLECT_CONF is
+\fI/etc/ccollect\fR, if unset\&.
 .RE
 .PP
 $CCOLLECT_CONF/logwrapper/destination
@@ -34,20 +42,14 @@ $CCOLLECT_CONF/logwrapper/destination
 Link to the destination directory for the logfiles
 .RE
 .SH "SEE ALSO"
+.sp
 ccollect(1), ccollect_add_source(1), ccollect_analyse_logs(1), ccollect_delete_source(1), ccollect_list_intervals(1)
-.sp
 .SH "AUTHOR"
-Nico Schottelius 
 .sp
+Nico Schottelius 
 .SH "RESOURCES"
-Main web site: http://unix\.schottelius\.org/ccollect/
 .sp
+Main web site: http://www\&.nico\&.schottelius\&.org/software/ccollect/
 .SH "COPYING"
-Copyright (C) 2007\-2008 Nico Schottelius\. Free use of this software is granted under the terms of the GNU General Public License Version 3 (GPLv3)\.
 .sp
-.SH "NOTES"
-.IP " 1." 4
-nico-ccollect--@--schottelius.org
-.RS 4
-\%mailto:nico-ccollect--@--schottelius.org
-.RE
+Copyright (C) 2007\-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_logwrapper.htm b/software/ccollect/doc/man/ccollect_logwrapper.htm
index ce455977..484f4be1 100644
--- a/software/ccollect/doc/man/ccollect_logwrapper.htm
+++ b/software/ccollect/doc/man/ccollect_logwrapper.htm
@@ -1,6 +1,6 @@
-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
        
+(stdout and stderr) to it.
        OPTIONS
        Options are passed directly to ccollect(1).
        FILES
        
 $CCOLLECT_CONF/logwrapper
 
        
    Directory containing the configuration. $CCOLLECT_CONF is /etc/ccollect, if unset.
@@ -8,6 +8,6 @@ $CCOLLECT_CONF/logwrapper
 $CCOLLECT_CONF/logwrapper/destination
 
        
    Link to the destination directory for the logfiles
-
        SEE ALSO
        ccollect(1), ccollect_add_source(1), ccollect_analyse_logs(1),
-ccollect_delete_source(1), ccollect_list_intervals(1)
        AUTHOR
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        RESOURCES
        Main web site: http://unix.schottelius.org/ccollect/
        COPYING
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        SEE ALSO
        ccollect(1), ccollect_add_source(1), ccollect_analyse_logs(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) 2007-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_logwrapper.html b/software/ccollect/doc/man/ccollect_logwrapper.html
index 2b3b9266..2ad29cf1 100644
--- a/software/ccollect/doc/man/ccollect_logwrapper.html
+++ b/software/ccollect/doc/man/ccollect_logwrapper.html
@@ -3,7 +3,8 @@
 
 
 
-
+
+ccollect_logwrapper(1)
 
-ccollect_logwrapper(1)
 
 
 
 
        1. NAME
        
 
        
-
        ccollect_logwrapper - start ccollect(1) and create a unique logfile
        
+
        ccollect_logwrapper - start ccollect(1) and create a unique logfile
        
 
        
 
        2. SYNOPSIS
        
 
        
-
        ccollect_logwrapper.sh <ccollect options>
        
+
        ccollect_logwrapper.sh <ccollect options>
        
 
        
 
        3. DESCRIPTION
        
 
        
-
        ccollect_logwrapper.sh creates a unique logfile below
+
        ccollect_logwrapper.sh creates a unique logfile below
 $CCOLLECT_CONF/logwrapper and redirects ccollect(1) output
 (stdout and stderr) to it.
        
 
        
 
        4. OPTIONS
        
 
        
-
        Options are passed directly to ccollect(1).
        
+
        Options are passed directly to ccollect(1).
        
 
        
 
        5. FILES
        
 
        
-
        
-
        
+
        
+
        
 $CCOLLECT_CONF/logwrapper
 
        
 
        
@@ -340,7 +417,7 @@ $CCOLLECT_CONF/logwrapper
    Directory containing the configuration. $CCOLLECT_CONF is /etc/ccollect, if unset.
 
        
 
        
-
        
+
        
 $CCOLLECT_CONF/logwrapper/destination
 
        
 
        
@@ -352,25 +429,25 @@ $CCOLLECT_CONF/logwrapper/destination
 
        
 
        6. SEE ALSO
        
 
        
-
        ccollect(1), ccollect_add_source(1), ccollect_analyse_logs(1),
+
        ccollect(1), ccollect_add_source(1), ccollect_analyse_logs(1),
 ccollect_delete_source(1), ccollect_list_intervals(1)
        
 
        
 
        7. AUTHOR
        
 
        
-
        Nico Schottelius <nico-ccollect—@--schottelius.org>
        
+
        Nico Schottelius <nico-ccollect--@--schottelius.org>
        
 
        
 
        8. RESOURCES
        
 
        
-
        Main web site: http://unix.schottelius.org/ccollect/
        
+
        Main web site: http://www.nico.schottelius.org/software/ccollect/
        
 
        
 
        9. COPYING
        
 
        
-
        Copyright (C) 2007-2008 Nico Schottelius. Free use of this software is
+
        Copyright (C) 2007-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_logwrapper.text b/software/ccollect/doc/man/ccollect_logwrapper.text
index ce1c5f62..8084c106 100644
--- a/software/ccollect/doc/man/ccollect_logwrapper.text
+++ b/software/ccollect/doc/man/ccollect_logwrapper.text
@@ -47,7 +47,7 @@ Nico Schottelius 
 
 RESOURCES
 ---------
-Main web site: http://unix.schottelius.org/ccollect/[]
+Main web site: http://www.nico.schottelius.org/software/ccollect/[]
 
 
 COPYING