Menu
▾
▴
SF.net SVN: safekeep:[662] website/trunk/WebContent
|
From: <di...@us...> - 2009-05-21 15:50:44
|
Revision: 662
http://safekeep.svn.sourceforge.net/safekeep/?rev=662&view=rev
Author: dimi
Date: 2009-05-21 15:50:35 +0000 (Thu, 21 May 2009)
Log Message:
-----------
Update man pages on website to latest as of Thu May 21 11:39:19 EDT 2009
Modified Paths:
--------------
website/trunk/WebContent/safekeep.backup.html
website/trunk/WebContent/safekeep.conf.html
website/trunk/WebContent/safekeep.html
Modified: website/trunk/WebContent/safekeep.backup.html
===================================================================
--- website/trunk/WebContent/safekeep.backup.html 2009-05-21 13:54:07 UTC (rev 661)
+++ website/trunk/WebContent/safekeep.backup.html 2009-05-21 15:50:35 UTC (rev 662)
@@ -1,334 +1,32 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.2" />
-<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
-}
-
-body {
- margin: 1em 5% 1em 5%;
-}
-
-a {
- color: blue;
- text-decoration: underline;
-}
-a:visited {
- color: fuchsia;
-}
-
-em {
- font-style: italic;
-}
-
-strong {
- font-weight: bold;
-}
-
-tt {
- color: navy;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #527bbd;
- font-family: sans-serif;
- margin-top: 1.2em;
- margin-bottom: 0.5em;
- line-height: 1.3;
-}
-
-h1 {
- border-bottom: 2px solid silver;
-}
-h2 {
- border-bottom: 2px solid silver;
- padding-top: 0.5em;
-}
-
-div.sectionbody {
- font-family: serif;
- margin-left: 0;
-}
-
-hr {
- border: 1px solid silver;
-}
-
-p {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-pre {
- padding: 0;
- margin: 0;
-}
-
-span#author {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- font-size: 1.1em;
-}
-span#email {
-}
-span#revision {
- font-family: sans-serif;
-}
-
-div#footer {
- font-family: sans-serif;
- font-size: small;
- border-top: 2px solid silver;
- padding-top: 0.5em;
- margin-top: 4.0em;
-}
-div#footer-text {
- float: left;
- padding-bottom: 0.5em;
-}
-div#footer-badges {
- float: right;
- padding-bottom: 0.5em;
-}
-
-div#preamble,
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
-div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
-div.admonitionblock {
- margin-right: 10%;
- margin-top: 1.5em;
- margin-bottom: 1.5em;
-}
-div.admonitionblock {
- margin-top: 2.5em;
- margin-bottom: 2.5em;
-}
-
-div.content { /* Block element content. */
- padding: 0;
-}
-
-/* Block element titles. */
-div.title, caption.title {
- font-family: sans-serif;
- font-weight: bold;
- text-align: left;
- margin-top: 1.0em;
- margin-bottom: 0.5em;
-}
-div.title + * {
- margin-top: 0;
-}
-
-td div.title:first-child {
- margin-top: 0.0em;
-}
-div.content div.title:first-child {
- margin-top: 0.0em;
-}
-div.content + div.title {
- margin-top: 0.0em;
-}
-
-div.sidebarblock > div.content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-
-div.listingblock {
- margin-right: 0%;
-}
-div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock > div.content {
- padding-left: 2.0em;
-}
-
-div.attribution {
- text-align: right;
-}
-div.verseblock + div.attribution {
- text-align: left;
-}
-
-div.admonitionblock .icon {
- vertical-align: top;
- font-size: 1.1em;
- font-weight: bold;
- text-decoration: underline;
- color: #527bbd;
- padding-right: 0.5em;
-}
-div.admonitionblock td.content {
- padding-left: 0.5em;
- border-left: 2px solid silver;
-}
-
-div.exampleblock > div.content {
- border-left: 2px solid silver;
- padding: 0.5em;
-}
-
-div.verseblock div.content {
- white-space: pre;
-}
-
-div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
-span.image img { border-style: none; }
-
-dl {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-dt {
- margin-top: 0.5em;
- margin-bottom: 0;
- font-style: italic;
-}
-dd > *:first-child {
- margin-top: 0;
-}
-
-ul, ol {
- list-style-position: outside;
-}
-ol.olist2 {
- list-style-type: lower-alpha;
-}
-
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead {
- font-family: sans-serif;
- font-weight: bold;
-}
-tfoot {
- font-weight: bold;
-}
-
-div.hlist {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-div.hlist td {
- padding-bottom: 5px;
-}
-td.hlist1 {
- vertical-align: top;
- font-style: italic;
- padding-right: 0.8em;
-}
-td.hlist2 {
- vertical-align: top;
-}
-
-@media print {
- div#footer-badges { display: none; }
-}
-
-div#toctitle {
- color: #527bbd;
- font-family: sans-serif;
- font-size: 1.1em;
- font-weight: bold;
- margin-top: 1.0em;
- margin-bottom: 0.1em;
-}
-
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
- margin-top: 0;
- margin-bottom: 0;
-}
-div.toclevel2 {
- margin-left: 2em;
- font-size: 0.9em;
-}
-div.toclevel3 {
- margin-left: 4em;
- font-size: 0.9em;
-}
-div.toclevel4 {
- margin-left: 6em;
- font-size: 0.9em;
-}
-include1::./stylesheets/xhtml11-manpage.css[]
-/* Workarounds for IE6's broken and incomplete CSS2. */
-
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock-content {
- padding-left: 2.0em;
-}
-
-div.exampleblock-content {
- border-left: 2px solid silver;
- padding-left: 0.5em;
-}
-
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
-</style>
-<title>safekeep.backup(5)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="generator" content="AsciiDoc 8.4.1">
+<title>safekeep.backup</title>
</head>
<body>
-<div id="header">
+<hr>
<h1>
-safekeep.backup(5) Manual Page
+ safekeep.backup(5) Manual Page
</h1>
+<hr>
<h2>NAME</h2>
-<div class="sectionbody">
<p>safekeep.backup -
Configuration file for a 'safekeep(1)' client
</p>
-</div>
-</div>
<h2>SYNOPSIS</h2>
-<div class="sectionbody">
<p>These files are usually placed in <tt>/etc/safekeep/backup.d/</tt> to be picked
-up automatically by <em>safekeep(1)</em>. They must have a <tt>.backup</tt> extension.</p>
-</div>
-<h2>DESCRIPTION</h2>
-<div class="sectionbody">
+up automatically by <b>safekeep(1)</b>. They must have a <tt>.backup</tt> extension.</p>
+<h2><a name="_description"></a>DESCRIPTION</h2>
<p>Each configuration file controls the backup of a host. They are typically
named after the hostname of the machine they control the backup for, and
-have a <em>.backup</em> extension (e.g. <tt>mailbox.backup</tt>). These files are written
+have a <b>.backup</b> extension (e.g. <tt>mailbox.backup</tt>). These files are written
in XML. Virtually all elements and attributes are optional; if not present,
<tt>safekeep(1)</tt> will provide reasonable, useful defaults.</p>
<p>The full set of supported elements and attributes looks as follows:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt><backup id="my_workstation">
+<table border="0" bgcolor="#e8e8e8" width="100%" cellpadding="10"><tr><td>
+<pre><backup id="my_workstation">
<!-- the client backup host, the user under which the servers will connect,
the SSH keys used for control and data transfer -->
@@ -390,13 +88,11 @@
<include regexp=".*\.ogg"/>
<exclude regexp=".*\.mp3"/>
</data>
-</backup></tt></pre>
-</div></div>
-</div>
-<h2>PARAMETERS</h2>
-<div class="sectionbody">
+</backup></pre>
+</td></tr></table>
+<h2><a name="_parameters"></a>PARAMETERS</h2>
<p>XML elements and attributes are referred to via XPath expressions: elements
-are separated by <em>/</em>, attributes are introduced by <em>@</em>:</p>
+are separated by <b>/</b>, attributes are introduced by <b>@</b>:</p>
<dl>
<dt>
/backup
@@ -437,8 +133,8 @@
<p>
The user name to use when connecting to the client. This user
must have read permissions for the files that will be backed up,
- so it most likely needs to be <em>root</em>.
- Optional, defaults to <em>root</em>.
+ so it most likely needs to be <b>root</b>.
+ Optional, defaults to <b>root</b>.
</p>
</dd>
<dt>
@@ -501,8 +197,8 @@
<dd>
<p>
The path under which the backups will be stored. Relative
- paths are based on the <em>base.dir</em> setting from the <em>safekeep.conf(5)</em>.
- Since the default value for <em>base.dir</em> is the user's home directory,
+ paths are based on the <b>base.dir</b> setting from the <b>safekeep.conf(5)</b>.
+ Since the default value for <b>base.dir</b> is the user’s home directory,
in a typical installation the data will be stored under
<tt>/var/lib/safekeep/<id>/</tt>. If the directory does not exist,
<tt>safekeep(1)</tt> will attempt to create it automatically. The backup
@@ -511,7 +207,7 @@
Use of the default value is <strong>highly</strong> recommended.
<strong>NOTE</strong>: if you must set this value explicitly, you must
make sure that the path is not shared between different boxes;
- a shared repository path <em>will</em> result in data loss.
+ a shared repository path <b>will</b> result in data loss.
</p>
</dd>
<dt>
@@ -531,9 +227,9 @@
always 86400 seconds.
Note that backups of deleted files are covered by this operation.
Thus if you deleted a file two weeks ago, backed up immediately
- afterward, and then ran <tt>safekeep(1)</tt> with a retention of <em>10D</em>
+ afterward, and then ran <tt>safekeep(1)</tt> with a retention of <b>10D</b>
today, no trace of that file would remain. Finally, file selection
- options don't affect removal of incremental data.
+ options don’t affect removal of incremental data.
Optional, defaults to empty (unlimited retention).
</p>
</dd>
@@ -673,7 +369,7 @@
<p>
The size of the snapshot. Unallocated space must exist on
the volume group. It is recommended that it is about 15-20%
- of the original device's size.
+ of the original device’s size.
Mandatory for a <tt><snapshot></tt> element.
</p>
</dd>
@@ -812,15 +508,13 @@
</p>
</dd>
</dl>
-</div>
-<h2>FILE SELECTION</h2>
-<div class="sectionbody">
+<h2><a name="_file_selection"></a>FILE SELECTION</h2>
<p><tt>safekeep(1)</tt> supports file selection options similar to <tt>rdiff-backup(1)</tt>.
When rdiff-backup is run, it searches through the given source directory
and backs up all the files specified by the file selection system.</p>
<p>The file selection system comprises a number of file selection conditions,
which are set using one of the <tt><include></tt>/<tt><exclude></tt> elements.
-Each file selection condition either matches or doesn't match a given file.
+Each file selection condition either matches or doesn’t match a given file.
A given file is included or excluded by the file selection system when the
first matching file selection condition specifies that the file be included
or excluded respectively; if the file matches no include or exclude
@@ -829,9 +523,7 @@
as if that file does not exist in the source directory.</p>
<p>For more information on file selection semantics, please see
<tt>rdiff-backup(1)</tt>.</p>
-</div>
-<h2>CLIENT SCRIPT</h2>
-<div class="sectionbody">
+<h2><a name="_client_script"></a>CLIENT SCRIPT</h2>
<p><tt>safekeep(1)</tt> support the optional execution of a script or program
on the client system at different steps during execution of the backup.</p>
<p>Note: specification of a script which does not exist is not considered an
@@ -864,22 +556,14 @@
- script is NOT writable by any one except the script owner.</p>
<p>Note: no test is made on the ownership of the parent directory or any other
directories.</p>
-</div>
-<h2>FILES</h2>
-<div class="sectionbody">
-<div class="literalblock">
-<div class="content">
-<pre><tt>/etc/safekeep/backup.d/</tt></pre>
-</div></div>
-</div>
-<h2>SEE ALSO</h2>
-<div class="sectionbody">
+<h2><a name="_files"></a>FILES</h2>
+<pre>/etc/safekeep/backup.d/</pre>
+<h2><a name="_see_also"></a>SEE ALSO</h2>
<p>safekeep(1), safekeep.conf(5), rdiff-backup(1), lvcreate(8)</p>
-</div>
-<div id="footer">
-<div id="footer-text">
-Last updated 30-Mar-2009 02:31:48 EDT
-</div>
-</div>
+<p></p>
+<p></p>
+<hr><p><small>
+Last updated 2009-05-21 11:18:36 EDT
+</small></p>
</body>
</html>
Modified: website/trunk/WebContent/safekeep.conf.html
===================================================================
--- website/trunk/WebContent/safekeep.conf.html 2009-05-21 13:54:07 UTC (rev 661)
+++ website/trunk/WebContent/safekeep.conf.html 2009-05-21 15:50:35 UTC (rev 662)
@@ -1,333 +1,30 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.2" />
-<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
-}
-
-body {
- margin: 1em 5% 1em 5%;
-}
-
-a {
- color: blue;
- text-decoration: underline;
-}
-a:visited {
- color: fuchsia;
-}
-
-em {
- font-style: italic;
-}
-
-strong {
- font-weight: bold;
-}
-
-tt {
- color: navy;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #527bbd;
- font-family: sans-serif;
- margin-top: 1.2em;
- margin-bottom: 0.5em;
- line-height: 1.3;
-}
-
-h1 {
- border-bottom: 2px solid silver;
-}
-h2 {
- border-bottom: 2px solid silver;
- padding-top: 0.5em;
-}
-
-div.sectionbody {
- font-family: serif;
- margin-left: 0;
-}
-
-hr {
- border: 1px solid silver;
-}
-
-p {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-pre {
- padding: 0;
- margin: 0;
-}
-
-span#author {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- font-size: 1.1em;
-}
-span#email {
-}
-span#revision {
- font-family: sans-serif;
-}
-
-div#footer {
- font-family: sans-serif;
- font-size: small;
- border-top: 2px solid silver;
- padding-top: 0.5em;
- margin-top: 4.0em;
-}
-div#footer-text {
- float: left;
- padding-bottom: 0.5em;
-}
-div#footer-badges {
- float: right;
- padding-bottom: 0.5em;
-}
-
-div#preamble,
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
-div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
-div.admonitionblock {
- margin-right: 10%;
- margin-top: 1.5em;
- margin-bottom: 1.5em;
-}
-div.admonitionblock {
- margin-top: 2.5em;
- margin-bottom: 2.5em;
-}
-
-div.content { /* Block element content. */
- padding: 0;
-}
-
-/* Block element titles. */
-div.title, caption.title {
- font-family: sans-serif;
- font-weight: bold;
- text-align: left;
- margin-top: 1.0em;
- margin-bottom: 0.5em;
-}
-div.title + * {
- margin-top: 0;
-}
-
-td div.title:first-child {
- margin-top: 0.0em;
-}
-div.content div.title:first-child {
- margin-top: 0.0em;
-}
-div.content + div.title {
- margin-top: 0.0em;
-}
-
-div.sidebarblock > div.content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-
-div.listingblock {
- margin-right: 0%;
-}
-div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock > div.content {
- padding-left: 2.0em;
-}
-
-div.attribution {
- text-align: right;
-}
-div.verseblock + div.attribution {
- text-align: left;
-}
-
-div.admonitionblock .icon {
- vertical-align: top;
- font-size: 1.1em;
- font-weight: bold;
- text-decoration: underline;
- color: #527bbd;
- padding-right: 0.5em;
-}
-div.admonitionblock td.content {
- padding-left: 0.5em;
- border-left: 2px solid silver;
-}
-
-div.exampleblock > div.content {
- border-left: 2px solid silver;
- padding: 0.5em;
-}
-
-div.verseblock div.content {
- white-space: pre;
-}
-
-div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
-span.image img { border-style: none; }
-
-dl {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-dt {
- margin-top: 0.5em;
- margin-bottom: 0;
- font-style: italic;
-}
-dd > *:first-child {
- margin-top: 0;
-}
-
-ul, ol {
- list-style-position: outside;
-}
-ol.olist2 {
- list-style-type: lower-alpha;
-}
-
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead {
- font-family: sans-serif;
- font-weight: bold;
-}
-tfoot {
- font-weight: bold;
-}
-
-div.hlist {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-div.hlist td {
- padding-bottom: 5px;
-}
-td.hlist1 {
- vertical-align: top;
- font-style: italic;
- padding-right: 0.8em;
-}
-td.hlist2 {
- vertical-align: top;
-}
-
-@media print {
- div#footer-badges { display: none; }
-}
-
-div#toctitle {
- color: #527bbd;
- font-family: sans-serif;
- font-size: 1.1em;
- font-weight: bold;
- margin-top: 1.0em;
- margin-bottom: 0.1em;
-}
-
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
- margin-top: 0;
- margin-bottom: 0;
-}
-div.toclevel2 {
- margin-left: 2em;
- font-size: 0.9em;
-}
-div.toclevel3 {
- margin-left: 4em;
- font-size: 0.9em;
-}
-div.toclevel4 {
- margin-left: 6em;
- font-size: 0.9em;
-}
-include1::./stylesheets/xhtml11-manpage.css[]
-/* Workarounds for IE6's broken and incomplete CSS2. */
-
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock-content {
- padding-left: 2.0em;
-}
-
-div.exampleblock-content {
- border-left: 2px solid silver;
- padding-left: 0.5em;
-}
-
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
-</style>
-<title>safekeep.conf(5)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="generator" content="AsciiDoc 8.4.1">
+<title>safekeep.conf</title>
</head>
<body>
-<div id="header">
+<hr>
<h1>
-safekeep.conf(5) Manual Page
+ safekeep.conf(5) Manual Page
</h1>
+<hr>
<h2>NAME</h2>
-<div class="sectionbody">
<p>safekeep.conf -
Configuration file for 'safekeep(1)'
</p>
-</div>
-</div>
<h2>SYNOPSIS</h2>
-<div class="sectionbody">
<p>This file resides in <tt>/etc/safekeep/</tt> from where it
-will be automatically picked up by <em>safekeep(1)</em>.</p>
-</div>
-<h2>DESCRIPTION</h2>
-<div class="sectionbody">
+will be automatically picked up by <b>safekeep(1)</b>.</p>
+<h2><a name="_description"></a>DESCRIPTION</h2>
<p>This configuration file holds safekeep global settings.
The format of the file is a simple key-value pair similar
-to Java properties files: lines starting with <em>#</em> are ignored
-as comments, keys are separated from values by <em>=</em>, and
+to Java properties files: lines starting with <b>#</b> are ignored
+as comments, keys are separated from values by <b>=</b>, and
leading and trailing spaces are ignored.</p>
-</div>
-<h2>PARAMETERS</h2>
-<div class="sectionbody">
+<h2><a name="_parameters"></a>PARAMETERS</h2>
<dl>
<dt>
backup.user
@@ -420,11 +117,9 @@
</p>
</dd>
</dl>
-</div>
-<h2>NOTES</h2>
-<div class="sectionbody">
+<h2><a name="_notes"></a>NOTES</h2>
<p>Safekeep uses <tt>trickle</tt> to implement bandwidth throttling (see
-http://monkey.org/~marius/pages/?page=trickle for more information).
+<a href="http://monkey.org/~marius/pages/?page=trickle">http://monkey.org/~marius/pages/?page=trickle</a> for more information).
You will need to install it separately to use this feature (most
Linux distributions have it packaged as <tt>trickle</tt>).</p>
<p>The bandwidth is calculated as an average over a 256KB window,
@@ -433,22 +128,14 @@
<p>The bandwidth throtlling can be customized for both download and upload
(see <tt>bandwidth.download</tt> and <tt>bandwidth.upload</tt>) as well as on a per-client
basis (see <tt>safekeep.backup(5)</tt> for more information).</p>
-</div>
-<h2>FILES</h2>
-<div class="sectionbody">
-<div class="literalblock">
-<div class="content">
-<pre><tt>/etc/safekeep/safekeep.conf</tt></pre>
-</div></div>
-</div>
-<h2>SEE ALSO</h2>
-<div class="sectionbody">
+<h2><a name="_files"></a>FILES</h2>
+<pre>/etc/safekeep/safekeep.conf</pre>
+<h2><a name="_see_also"></a>SEE ALSO</h2>
<p>safekeep(1), safekeep.backup(5), rdiff-backup(1), trickle(1), lvcreate(8)</p>
-</div>
-<div id="footer">
-<div id="footer-text">
-Last updated 30-Mar-2009 02:31:48 EDT
-</div>
-</div>
+<p></p>
+<p></p>
+<hr><p><small>
+Last updated 2009-05-21 11:18:36 EDT
+</small></p>
</body>
</html>
Modified: website/trunk/WebContent/safekeep.html
===================================================================
--- website/trunk/WebContent/safekeep.html 2009-05-21 13:54:07 UTC (rev 661)
+++ website/trunk/WebContent/safekeep.html 2009-05-21 15:50:35 UTC (rev 662)
@@ -1,328 +1,27 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.2" />
-<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
-}
-
-body {
- margin: 1em 5% 1em 5%;
-}
-
-a {
- color: blue;
- text-decoration: underline;
-}
-a:visited {
- color: fuchsia;
-}
-
-em {
- font-style: italic;
-}
-
-strong {
- font-weight: bold;
-}
-
-tt {
- color: navy;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #527bbd;
- font-family: sans-serif;
- margin-top: 1.2em;
- margin-bottom: 0.5em;
- line-height: 1.3;
-}
-
-h1 {
- border-bottom: 2px solid silver;
-}
-h2 {
- border-bottom: 2px solid silver;
- padding-top: 0.5em;
-}
-
-div.sectionbody {
- font-family: serif;
- margin-left: 0;
-}
-
-hr {
- border: 1px solid silver;
-}
-
-p {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-pre {
- padding: 0;
- margin: 0;
-}
-
-span#author {
- color: #527bbd;
- font-family: sans-serif;
- font-weight: bold;
- font-size: 1.1em;
-}
-span#email {
-}
-span#revision {
- font-family: sans-serif;
-}
-
-div#footer {
- font-family: sans-serif;
- font-size: small;
- border-top: 2px solid silver;
- padding-top: 0.5em;
- margin-top: 4.0em;
-}
-div#footer-text {
- float: left;
- padding-bottom: 0.5em;
-}
-div#footer-badges {
- float: right;
- padding-bottom: 0.5em;
-}
-
-div#preamble,
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
-div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
-div.admonitionblock {
- margin-right: 10%;
- margin-top: 1.5em;
- margin-bottom: 1.5em;
-}
-div.admonitionblock {
- margin-top: 2.5em;
- margin-bottom: 2.5em;
-}
-
-div.content { /* Block element content. */
- padding: 0;
-}
-
-/* Block element titles. */
-div.title, caption.title {
- font-family: sans-serif;
- font-weight: bold;
- text-align: left;
- margin-top: 1.0em;
- margin-bottom: 0.5em;
-}
-div.title + * {
- margin-top: 0;
-}
-
-td div.title:first-child {
- margin-top: 0.0em;
-}
-div.content div.title:first-child {
- margin-top: 0.0em;
-}
-div.content + div.title {
- margin-top: 0.0em;
-}
-
-div.sidebarblock > div.content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-
-div.listingblock {
- margin-right: 0%;
-}
-div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock > div.content {
- padding-left: 2.0em;
-}
-
-div.attribution {
- text-align: right;
-}
-div.verseblock + div.attribution {
- text-align: left;
-}
-
-div.admonitionblock .icon {
- vertical-align: top;
- font-size: 1.1em;
- font-weight: bold;
- text-decoration: underline;
- color: #527bbd;
- padding-right: 0.5em;
-}
-div.admonitionblock td.content {
- padding-left: 0.5em;
- border-left: 2px solid silver;
-}
-
-div.exampleblock > div.content {
- border-left: 2px solid silver;
- padding: 0.5em;
-}
-
-div.verseblock div.content {
- white-space: pre;
-}
-
-div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
-span.image img { border-style: none; }
-
-dl {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-dt {
- margin-top: 0.5em;
- margin-bottom: 0;
- font-style: italic;
-}
-dd > *:first-child {
- margin-top: 0;
-}
-
-ul, ol {
- list-style-position: outside;
-}
-ol.olist2 {
- list-style-type: lower-alpha;
-}
-
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead {
- font-family: sans-serif;
- font-weight: bold;
-}
-tfoot {
- font-weight: bold;
-}
-
-div.hlist {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-div.hlist td {
- padding-bottom: 5px;
-}
-td.hlist1 {
- vertical-align: top;
- font-style: italic;
- padding-right: 0.8em;
-}
-td.hlist2 {
- vertical-align: top;
-}
-
-@media print {
- div#footer-badges { display: none; }
-}
-
-div#toctitle {
- color: #527bbd;
- font-family: sans-serif;
- font-size: 1.1em;
- font-weight: bold;
- margin-top: 1.0em;
- margin-bottom: 0.1em;
-}
-
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
- margin-top: 0;
- margin-bottom: 0;
-}
-div.toclevel2 {
- margin-left: 2em;
- font-size: 0.9em;
-}
-div.toclevel3 {
- margin-left: 4em;
- font-size: 0.9em;
-}
-div.toclevel4 {
- margin-left: 6em;
- font-size: 0.9em;
-}
-include1::./stylesheets/xhtml11-manpage.css[]
-/* Workarounds for IE6's broken and incomplete CSS2. */
-
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
-}
-div.sidebar-title, div.image-title {
- font-family: sans-serif;
- font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
-}
-
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
-}
-
-div.quoteblock-content {
- padding-left: 2.0em;
-}
-
-div.exampleblock-content {
- border-left: 2px solid silver;
- padding-left: 0.5em;
-}
-
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
-</style>
-<title>safekeep(1)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="generator" content="AsciiDoc 8.4.1">
+<title>safekeep</title>
</head>
<body>
-<div id="header">
+<hr>
<h1>
-safekeep(1) Manual Page
+ safekeep(1) Manual Page
</h1>
+<hr>
<h2>NAME</h2>
-<div class="sectionbody">
<p>safekeep -
Client/server backup script
</p>
-</div>
-</div>
<h2>SYNOPSIS</h2>
-<div class="sectionbody">
-<p><em>safekeep</em> --server [-q] [-v] [--noemail] [--force] [-c file] [--cleanup] <clientid>*</p>
-<p><em>safekeep</em> --keys [-q] [-v] [--noemail] [-c file] [-i file] [--status] [--print] [--deploy] <clientid>*</p>
-<p><em>safekeep</em> --list [-q] [-v] [--noemail] [-c file] [--increments] [--parsable-output] [--sizes] [--changed=<time>] [--at-time=<time>] <clientid>*</p>
-<p><em>safekeep</em> --client [--cleanup]</p>
-<p><em>safekeep</em> -h | -V</p>
-</div>
-<h2>DESCRIPTION</h2>
-<div class="sectionbody">
+<p><b>safekeep</b> --server [-q] [-v] [--noemail] [--force] [-c file] [--cleanup] <clientid>*</p>
+<p><b>safekeep</b> --keys [-q] [-v] [--noemail] [-c file] [-i file] [--status] [--print] [--deploy] <clientid>*</p>
+<p><b>safekeep</b> --list [-q] [-v] [--noemail] [-c file] [--increments] [--parsable-output] [--sizes] [--changed=<time>] [--at-time=<time>] <clientid>*</p>
+<p><b>safekeep</b> --client [--cleanup]</p>
+<p><b>safekeep</b> -h | -V</p>
+<h2><a name="_description"></a>DESCRIPTION</h2>
<p>SafeKeep is a client/server backup script which enhances the
power of rdiff-backup with simple configuration and use.</p>
<p>SafeKeep can work in server mode, client mode, SSH key management mode
@@ -354,9 +53,7 @@
arguments. If no client ID is given, SafeKeep will operate over all known
clients.</p>
<p>Each mode accepts a few options as described below.</p>
-</div>
-<h2>OPERATION MODE</h2>
-<div class="sectionbody">
+<h2><a name="_operation_mode"></a>OPERATION MODE</h2>
<dl>
<dt>
--server
@@ -396,9 +93,7 @@
<p>Please note that you must always specify an operation mode. Earlier
versions used do default to <tt>--server</tt> mode, but that proved to work
out poorly in practice.</p>
-</div>
-<h2>GENERAL OPTIONS</h2>
-<div class="sectionbody">
+<h2><a name="_general_options"></a>GENERAL OPTIONS</h2>
<dl>
<dt>
-c, --conf=FILE
@@ -457,9 +152,7 @@
</p>
</dd>
</dl>
-</div>
-<h2>SERVER OPTIONS</h2>
-<div class="sectionbody">
+<h2><a name="_server_options"></a>SERVER OPTIONS</h2>
<dl>
<dt>
--force
@@ -488,9 +181,7 @@
</p>
</dd>
</dl>
-</div>
-<h2>CLIENT OPTIONS</h2>
-<div class="sectionbody">
+<h2><a name="_client_options"></a>CLIENT OPTIONS</h2>
<dl>
<dt>
--cleanup
@@ -506,9 +197,7 @@
</p>
</dd>
</dl>
-</div>
-<h2>KEYS OPTIONS</h2>
-<div class="sectionbody">
+<h2><a name="_keys_options"></a>KEYS OPTIONS</h2>
<dl>
<dt>
-i FILE
@@ -536,7 +225,7 @@
<dd>
<p>
Display the authorization keys for the clients. This is useful in
- case you want to manually copy it into the client's
+ case you want to manually copy it into the client’s
<tt>~/.ssh/authorized_keys</tt> file. This option is seldom useful.
</p>
</dd>
@@ -549,9 +238,7 @@
</p>
</dd>
</dl>
-</div>
-<h2>LIST OPTIONS</h2>
-<div class="sectionbody">
+<h2><a name="_list_options"></a>LIST OPTIONS</h2>
<dl>
<dt>
--increments
@@ -608,25 +295,21 @@
</p>
</dd>
</dl>
-</div>
-<h2>CONFIGURATION</h2>
-<div class="sectionbody">
+<h2><a name="_configuration"></a>CONFIGURATION</h2>
<p>Normally the configuration files are placed in the <tt>/etc/safekeep/backup.d/</tt>
directory from where they will get picked up automatically by SafeKeep.
Each backup client is described by a configuration file in XML format.
The minimum configuration file is:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt><backup>
+<table border="0" bgcolor="#e8e8e8" width="100%" cellpadding="10"><tr><td>
+<pre><backup>
<host name="my_workstation" />
-</backup></tt></pre>
-</div></div>
+</backup></pre>
+</td></tr></table>
<p>This will simply backup all relevant files (excluding temporary files,
caches, etc) from the client with the address <tt>my_workstation</tt>.</p>
<p>A more realistic example:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt><backup>
+<table border="0" bgcolor="#e8e8e8" width="100%" cellpadding="10"><tr><td>
+<pre><backup>
<host name="my_workstation" />
<repo retention="10D" />
<setup>
@@ -660,41 +343,34 @@
<exclude path="/"/>
</data>
-</backup></tt></pre>
-</div></div>
+</backup></pre>
+</td></tr></table>
<p>In this case, SafeKeep will dump all databases managed by PostgreSQL,
snapshot the disk via LVM, and proceed to backup <tt>/etc</tt>, <tt>/home</tt>,
<tt>/root</tt>, <tt>/srv</tt>, <tt>/var</tt>, while excluding some unneeded files and
directories. Older data will be retained for 10 days.</p>
<p>For full reference documentation of the configuration format, see
safekeep.backup(5).</p>
-</div>
-<h2>CLIENT IDS</h2>
-<div class="sectionbody">
+<h2><a name="_client_ids"></a>CLIENT IDS</h2>
<p>Normally the client IDs are generated automatically from the configuration
filenames without the extension. E.g. if a configuration file is named
<tt>my_workstation.conf</tt>, the client ID becomes <tt>my_workstation</tt>. For more
information on this topic, see safekeep.backup(5).</p>
-</div>
-<h2>KEY DEPLOYMENT</h2>
-<div class="sectionbody">
+<h2><a name="_key_deployment"></a>KEY DEPLOYMENT</h2>
<p>The <tt>safekeep(1)</tt> server needs to access the clients in order to conduct
the backup. To that end, it establishes two ssh(1) pipes: one for control,
and one for data. To simplify the deployment of the keys, <tt>safekeep(1)</tt>
has a key deploy mode.</p>
<p>When deploying keys using the built-in key management functionality,
<tt>safekeep(1)</tt> needs to be invoked as the user under which it will function
-as a server. By default, that user is <em>safekeep</em>. For extra security,
+as a server. By default, that user is <b>safekeep</b>. For extra security,
you can not login into that account, so you have to invoke <tt>safekeep(1)</tt>
-as <em>root</em>:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt> [root@yourbox ~] # safekeep --keys --deploy</tt></pre>
-</div></div>
-</div>
-<h2>RESTORING</h2>
-<div class="sectionbody">
-<p>Since <tt>safekeep(1)</tt> is built around <tt>rdiff-backup(1)</tt>, it doesn't have any
+as <b>root</b>:</p>
+<table border="0" bgcolor="#e8e8e8" width="100%" cellpadding="10"><tr><td>
+<pre> [root@yourbox ~] # safekeep --keys --deploy</pre>
+</td></tr></table>
+<h2><a name="_restoring"></a>RESTORING</h2>
+<p>Since <tt>safekeep(1)</tt> is built around <tt>rdiff-backup(1)</tt>, it doesn’t have any
built-in restore capabilities. It simply relies on <tt>rdiff-backup</tt> to perform
this task.</p>
<p>To do so, you just need to know the directory where the data is actually
@@ -702,54 +378,44 @@
<tt>/etc/safekeep/backup.d/mybox.backup</tt>, the data will be stored under
<tt>/var/lib/safekeep/mybox/</tt>. Please refer to <tt>safekeep.backup(5)</tt> for more
information on this matter.</p>
-<p>Once you have determined where the data will be stored (we'll continue
+<p>Once you have determined where the data will be stored (we’ll continue
the example above), all you have to do is run <tt>rdiff-backup</tt>:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt> # rdiff-backup -r 1s /var/lib/safekeep/mybox my-restore-dir</tt></pre>
-</div></div>
+<table border="0" bgcolor="#e8e8e8" width="100%" cellpadding="10"><tr><td>
+<pre> # rdiff-backup -r 1s /var/lib/safekeep/mybox my-restore-dir</pre>
+</td></tr></table>
<p>You will be able to find more information on the restore procedure in
the <tt>rdiff-backup(1)</tt> man page.</p>
-</div>
-<h2>FILE SELECTION</h2>
-<div class="sectionbody">
+<h2><a name="_file_selection"></a>FILE SELECTION</h2>
<p>It is important to note that the <tt>include</tt>/<tt>exclude</tt> directives that
control file selection are matched in the order they appear in the
configuration file, and the first one that matches dictates whether
the file will be included or excluded. As a result, you have to
add the more specific ones first, or the more generic specifications
will always win. For example:</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt>...
+<table border="0" bgcolor="#e8e8e8" width="100%" cellpadding="10"><tr><td>
+<pre>...
<include path="/home"/>
<exclude path="/home/joe"/>
-...</tt></pre>
-</div></div>
+...</pre>
+</td></tr></table>
<p>will NOT do what you expect, because the <tt>/home</tt> will match before
<tt>/home/joe</tt>, and thus all files under <tt>/home</tt> will be included.
The correct way is to flip the two around</p>
-<div class="listingblock">
-<div class="content">
-<pre><tt>...
+<table border="0" bgcolor="#e8e8e8" width="100%" cellpadding="10"><tr><td>
+<pre>...
<exclude path="/home/joe"/>
<include path="/home"/>
-...</tt></pre>
-</div></div>
+...</pre>
+</td></tr></table>
<p>Please see safekeep.backup(5) for more information on file selection.</p>
-</div>
-<h2>SEE ALSO</h2>
-<div class="sectionbody">
+<h2><a name="_see_also"></a>SEE ALSO</h2>
<p>rdiff-backup(1), safekeep.conf(5), safekeep.backup(5)</p>
-</div>
-<h2>AUTHOR</h2>
-<div class="sectionbody">
-<p>Written by Dimi Paun <di...@la...> and Stelian Pop <st...@la...>.</p>
-</div>
-<div id="footer">
-<div id="footer-text">
-Last updated 07-Oct-2008 16:17:26 EDT
-</div>
-</div>
+<h2><a name="_author"></a>AUTHOR</h2>
+<p>Written by Dimi Paun <<a href="mailto:di...@la...">di...@la...</a>> and Stelian Pop <<a href="mailto:st...@la...">st...@la...</a>>.</p>
+<p></p>
+<p></p>
+<hr><p><small>
+Last updated 2009-05-21 11:18:36 EDT
+</small></p>
</body>
</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
