changeset
more documentation
Thu, 03 Aug 2017 18:29:00 +0200
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Thu, 03 Aug 2017 18:29:00 +0200
- changeset 273
- c743721d566f
- parent 272
- b321a3be0a38
- child 274
- 5577d3eae04c
more documentation
--- a/README Thu Aug 03 14:32:36 2017 +0200 +++ b/README Thu Aug 03 18:29:00 2017 +0200 @@ -1,5 +1,5 @@ - DavUtils - cmd tools -============================ + DavUtils - dav cmd tools +========================== Introduction ------------ @@ -19,7 +19,8 @@ Documentation ------------- -Documentation can be found at http://davutils.sourceforge.net/docs/ +Documentation can be found at http://davutils.sourceforge.net/docs/ and +in the docs sub-directory. First Steps
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/add-directory.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,73 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<h1 id="dav-sync-add-directory">dav-sync add-directory</h1> +<p>The command runs an interactive assistant that creates a sync-directory configuration and adds it to the sync.xml file. Before running this command, a repository must be created. See <a href="./add-repository.html">dav add-repository</a>.</p> +<p><strong>Command alias:</strong> add-dir</p> +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/add-repository.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/add-repository.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,14 +43,30 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div> <!-- begin content --> <div class="content"> - +<h1 id="dav-add-repository">dav add-repository</h1> +<p>The command runs an interactive assistant that creates a repository configuration and adds it to the config.xml file.</p> +<p><strong>Command alias:</strong> add-repo</p> </div> <!-- end content --> </body>
--- a/docs/html/check-config.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/check-config.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,14 +43,29 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div> <!-- begin content --> <div class="content"> - +<h1 id="dav-check-config">dav check-config</h1> +<p>Validates the config.xml file. If the config is ok, it prints <code>Configuration OK.</code> on stdout and returns 0, otherwise it prints an error message on stderr and returns 1.</p> </div> <!-- end content --> </body>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/check-repositories.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,71 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> + +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/commands.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/commands.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/configuration.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/configuration.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div> @@ -63,7 +77,7 @@ Example: <code><name>myrepo</name></code></p> <h3 id="url">url</h3> <p>The url must point to a valid WebDAV compilant collection.</p> -<p>Type: string<br /> +<p>Type: url<br /> Example: <code><url>https://example.com/webdav/repo1/</url></code></p> <h3 id="user">user</h3> <p>User used for authentication</p> @@ -138,23 +152,56 @@ <p>Required child elements: <code><url></code><br /> Optional elements: <code><user></code>, <code><password></code>, <code><no></code></p> <h3 id="url-1">url</h3> +<p>Specifies the proxy url.</p> +<p>Type: url<br /> +Example: <code><url>http://myproxy/</url></code></p> <h3 id="user-1">user</h3> +<p>User used for authentication with the proxy.</p> +<p>Type: string<br /> +Example: <code><user>alice</user></code></p> <h3 id="password-1">password</h3> +<p>A base64 encoded password used for authentication.</p> +<p>Type: base64 string<br /> +Example: <code><password>MTIzNDU2Nzg=</password></code></p> <h3 id="no">no</h3> +<p>A comma separated list of all hosts that should not be accessed through the proxy.</p> +<p>Type: string<br /> +Example: <code><no>host1, host2, host3</no></code></p> <h2 id="example-1-minimal-repository-configuration">Example 1: minimal repository configuration</h2> <p>A minimal configuration for a repository. If no user and/or password are configured, dav prompts for authentication informations if required.</p> -<pre><code><repository> - <name>myrepo</name> - <url>https://example.com/path/to/repo/</url> -</repository></code></pre> +<pre><code><configuration> + <repository> + <name>myrepo</name> + <url>https://example.com/path/to/repo/</url> + </repository> +</configuration></code></pre> <h2 id="example-2-repository-with-authentication-informations">Example 2: repository with authentication informations</h2> <p>A typical configuration for easy accessing a repository without authentication prompt.</p> -<pre><code><repository> - <name>myrepo</name> - <url>https://example.com/path/to/repo/</url> - <user>alice</user> - <password>MTIzNDU2Nzg=</password> -</repository></code></pre> +<pre><code><configuration> + <repository> + <name>myrepo</name> + <url>https://example.com/path/to/repo/</url> + <user>alice</user> + <password>MTIzNDU2Nzg=</password> + </repository> +</configuration></code></pre> +<h2 id="example-3-repository-with-full-encryption">Example 3: repository with full encryption</h2> +<p>A configuration for a full encrypted repository. Additionally to the repository a key must be configured.</p> +<pre><code><configuration> + <repository> + <name>myrepo</name> + <url>https://example.com/path/to/repo/</url> + <user>alice</user> + <password>MTIzNDU2Nzg=</password> + <full-encryption>true</full-encryption> + </repository> + + <key> + <name>mykey1</name> + <file>keys/mykey1</file> + <type>aes256</type> + </key> +</configuration></code></pre> </div> <!-- end content --> </body>
--- a/docs/html/copy.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/copy.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/date.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/date.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/davdoc.css Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/davdoc.css Thu Aug 03 18:29:00 2017 +0200 @@ -28,14 +28,14 @@ div.nav { color: black; - background-color: #E9EBEC; + background-color: #d2d2d2; margin-bottom: 1em; padding-bottom: 0.1em; } div.nav h3 { color: white; - background-color: #5B6F7A; + background-color: #1a3300; font-size: 1.2em; padding-top: 0.2em; padding-bottom: 0.2em; @@ -59,7 +59,7 @@ div.content h1 { color: white; - background-color: #5B6F7A; + background-color: #1a3300; font-size: 1.2em; padding-top: 0.2em; padding-bottom: 0.2em;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/delete-conflicts.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,71 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> + +</div> +<!-- end content --> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/empty-trash.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,71 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> + +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/encryption.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/encryption.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,14 +43,55 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div> <!-- begin content --> <div class="content"> - +<h1 id="encryption">Encryption</h1> +<p>The davutils programs have an integrated client-side encryption feature, that allows you to encrypt and decrypt on the fly with AES256 or AES128. To use this feature, the server <strong>must</strong> support WebDAV dead properties.</p> +<p>The tools support both, encryption of the resource content and encryption of the resource name. Each resource is encrypted separately. With activated name encryption, the actual resource name is random but the name used by the client is stored encrypted in WebDAV properties. This means, an attacker can see the directory structure and the file length, but can't see which files have the same name.</p> +<p>To enable encryption a key must be configured in <code>$HOME/.dav/config.xml</code>. A key must have an unique name. To access encrypted resources, all clients must configure the same key with the same name. Currently a key can only be loaded from a file and not generated from a password.</p> +<p>A configuration for a key looks like:</p> +<pre><code><key> + <name>mykey1</name> + <file>keys/mykey1</file> +</key> </code></pre> +<p>The file path must be relative to <code>$HOME/.dav/</code>. In this example the file <code>$HOME/.dav/keys/mykey1</code> is loaded.</p> +<p>To generate a key use <strong><code>dd</code></strong> on unix like systems.</p> +<pre><code>dd if=/dev/random of=mykey1 bs=32 count=1</code></pre> +<p>After a key is configured, you can enable encryption/decryption in two ways. You can use the dav option <strong><code>-c</code></strong> to enable encryption and specify your key with the <strong><code>-k</code></strong> option. The alternative is to enable encryption by default for a repository in the config.xml file.</p> +<pre><code><repository> + <name>myrepo</name> + <url>http://example.com/webdav/</url> + + <default-key>mykey1</default-key> + <full-encryption>true</full-encryption> +</repository></code></pre> +<p>See <a href="./configuration.html">Configuration</a> for details.</p> +<h2 id="internals">Internals</h2> +<p>When a resource is encrypted, some crypto properties (namespace: http://davutils.org/) are set for the resource.</p> +<ul> +<li>crypto-key: Contains the name of the key used for encryption. The presence of this property indicates that the resource is encrypted</li> +<li>crypto-hash: A Hash of the cleartext, encrypted and base64 encoded</li> +<li>crypto-name: The name of the resource, encrypted and base64 encoded. This property is not used if name encryption is disabled.</li> +</ul> </div> <!-- end content --> </body>
--- a/docs/html/get-property.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/get-property.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/get.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/get.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/getting-started.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/getting-started.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div> @@ -76,8 +90,7 @@ Added repository: myserv (http://example.com/webdav/)</code></pre> -<p>You can also configure the config.xml yourself, check out this example page and the config.xml spec.</p> -<p>More informations about urls and path in dav here.</p> +<p>You can also configure the config.xml yourself, check out <a href="./configuration.html">the config.xml spec</a>.</p> </div> <!-- end content --> </body>
--- a/docs/html/info.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/info.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/introduction.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,71 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> + +</div> +<!-- end content --> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/list-directories.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,73 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<h1 id="dav-sync-list-directories">dav-sync list-directories</h1> +<p>This command lists all configured sync-directories.</p> +<p><strong>Command alias:</strong> list-dirs</p> +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/list-repositories.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/list-repositories.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,14 +43,30 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div> <!-- begin content --> <div class="content"> - +<h1 id="dav-list-repositories">dav list-repositories</h1> +<p>This command lists all configured repositories.</p> +<p><strong>Command alias:</strong> list-repos</p> </div> <!-- end content --> </body>
--- a/docs/html/list.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/list.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/lock.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/lock.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/mkdir.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/mkdir.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/move.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/move.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/pull.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,78 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<h1 id="dav-sync-pull">dav-sync pull</h1> +<p><strong><code>pull [-cld] <directory></code></strong></p> +<p>Pulls all changes from the server. All new or modified files are downloaded and all files deleted on the server are deleted locally. If a file is also locally modified and conflict detection is not disabled, the local file is renamed and an entry in the conflict database is added.</p> +<p>When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory.</p> +<p>When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash.</p> +<p><strong><code>-c</code></strong> Disable conflict detection. This always overrides locally modified files</p> +<p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>pull</code> completed, the repository is unlocked</p> +<p><strong><code>-d</code></strong> Don't lock the repository</p> +</div> +<!-- end content --> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/push.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,77 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<h1 id="dav-sync-push">dav-sync push</h1> +<p><strong><code>push [-cld] <directory></code></strong></p> +<p>Pushes all local changes to the server. This uploads all locally modified files and deletes all locally deleted files on the server.</p> +<p>If conflict detection is not disabled, all files that are also modified on the server will be skipped.</p> +<p><strong><code>-c</code></strong> Disable conflict detection. This always overrides files on the server</p> +<p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>push</code> completed, the repository is unlocked</p> +<p><strong><code>-d</code></strong> Don't lock the repository</p> +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/put.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/put.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/html/remove.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/remove.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/resolve-conflicts.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,71 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> + +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/set-property.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/set-property.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/sync-check-config.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,72 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<h1 id="dav-sync-check-config">dav-sync check-config</h1> +<p>Validates the sync.xml file. If the config is ok, it prints Configuration OK. on stdout and returns 0, otherwise it prints an error message on stderr and returns 1.</p> +</div> +<!-- end content --> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/sync-commands.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,77 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> +<h1 id="commands">Commands</h1> +<p>All commands expect a <code><directory></code> argument, which is the identifer of a local directory that should be synchronized. The directory must be configured in sync.xml. See <a href="./sync-configuration.html">Configuration</a>.</p> +<h2 id="common-commands">Common Commands</h2> +<p>Get resources from the server, which are modified since last sync:</p> +<pre><code>dav pull <directory></code></pre> +<p>Upload all locally modified resources:</p> +<pre><code>dav push <directory></code></pre> +</div> +<!-- end content --> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/sync-configuration.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,71 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> + +</div> +<!-- end content --> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/html/trash-info.html Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,71 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta http-equiv="Content-Style-Type" content="text/css" /> + <meta name="generator" content="pandoc" /> + <title></title> + <style type="text/css">code{white-space: pre;}</style> + <link rel="stylesheet" href="davdoc.css" type="text/css" /> +</head> +<body> +<div class="header"> + <span>davutils documentation</span> +</div> +<div class="sidebar"> + <div class="nav"> + <h3>dav</h3> + <ul> + <li><a href="getting-started.html">Getting started</a></li> + <li><a href="commands.html">Commands</a></li> + <ul> + <li><a href="list.html">list</a></li> + <li><a href="get.html">get</a></li> + <li><a href="put.html">put</a></li> + <li><a href="mkdir.html">mkdir</a></li> + <li><a href="remove.html">remove</a></li> + <li><a href="copy.html">copy</a></li> + <li><a href="move.html">move</a></li> + <li><a href="get-property.html">get-property</a></li> + <li><a href="set-property.html">set-property</a></li> + <li><a href="lock.html">lock</a></li> + <li><a href="unlock.html">unlock</a></li> + <li><a href="info.html">info</a></li> + <li><a href="date.html">date</a></li> + <li><a href="add-repository.html">add-repository</a></li> + <li><a href="list-repositories.html">list-repositories</a></li> + <li><a href="check-config.html">check-config</a></li> + </ul> + <li><a href="configuration.html">Configuration</a></li> + <li><a href="encryption.html">Encryption</a></li> + </ul> + </div> + <div class="nav"> + <h3>dav-sync</h3> + <ul> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> + </ul> + </div> +</div> + +<!-- begin content --> +<div class="content"> + +</div> +<!-- end content --> +</body> +</html>
--- a/docs/html/unlock.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/html/unlock.html Thu Aug 03 18:29:00 2017 +0200 @@ -43,7 +43,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- a/docs/src/Makefile Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/Makefile Thu Aug 03 18:29:00 2017 +0200 @@ -49,6 +49,20 @@ SRC += add-repository.md SRC += list-repositories.md SRC += check-config.md +SRC += introduction.md +SRC += sync-commands.md +SRC += pull.md +SRC += push.md +SRC += resolve-conflicts.md +SRC += delete-conflicts.md +SRC += trash-info.md +SRC += empty-trash.md +SRC += add-directory.md +SRC += list-directories.md +SRC += sync-check-config.md +SRC += check-repositories.md +SRC += sync-configuration.md + HTML = $(SRC:%.md=build/%.html)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/add-directory.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,8 @@ +dav-sync add-directory +====================== + +The command runs an interactive assistant that creates a sync-directory configuration and adds it to the sync.xml file. Before running this command, a repository must be created. See [dav add-repository][1]. + +[1]: ./add-repository.html + +**Command alias:** add-dir
--- a/docs/src/add-repository.md Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/add-repository.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,6 @@ +dav add-repository +================== + +The command runs an interactive assistant that creates a repository configuration and adds it to the config.xml file. + +**Command alias:** add-repo
--- a/docs/src/check-config.md Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/check-config.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,4 @@ +dav check-config +================ + +Validates the config.xml file. If the config is ok, it prints `Configuration OK.` on stdout and returns 0, otherwise it prints an error message on stderr and returns 1.
--- a/docs/src/configuration.md Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/configuration.md Thu Aug 03 18:29:00 2017 +0200 @@ -23,7 +23,7 @@ The url must point to a valid WebDAV compilant collection. -Type: string \ +Type: url \ Example: `<url>https://example.com/webdav/repo1/</url>` ### user @@ -150,29 +150,73 @@ ### url +Specifies the proxy url. + +Type: url \ +Example: `<url>http://myproxy/</url>` + ### user +User used for authentication with the proxy. + +Type: string \ +Example: `<user>alice</user>` + ### password +A base64 encoded password used for authentication. + +Type: base64 string \ +Example: `<password>MTIzNDU2Nzg=</password>` + ### no +A comma separated list of all hosts that should not be accessed through the proxy. + +Type: string \ +Example: `<no>host1, host2, host3</no>` + ## Example 1: minimal repository configuration A minimal configuration for a repository. If no user and/or password are configured, dav prompts for authentication informations if required. - <repository> - <name>myrepo</name> - <url>https://example.com/path/to/repo/</url> - </repository> + <configuration> + <repository> + <name>myrepo</name> + <url>https://example.com/path/to/repo/</url> + </repository> + </configuration> ## Example 2: repository with authentication informations A typical configuration for easy accessing a repository without authentication prompt. - <repository> - <name>myrepo</name> - <url>https://example.com/path/to/repo/</url> - <user>alice</user> - <password>MTIzNDU2Nzg=</password> - </repository> + <configuration> + <repository> + <name>myrepo</name> + <url>https://example.com/path/to/repo/</url> + <user>alice</user> + <password>MTIzNDU2Nzg=</password> + </repository> + </configuration> + +## Example 3: repository with full encryption + +A configuration for a full encrypted repository. Additionally to the repository a key must be configured. + <configuration> + <repository> + <name>myrepo</name> + <url>https://example.com/path/to/repo/</url> + <user>alice</user> + <password>MTIzNDU2Nzg=</password> + <full-encryption>true</full-encryption> + </repository> + + <key> + <name>mykey1</name> + <file>keys/mykey1</file> + <type>aes256</type> + </key> + </configuration> +
--- a/docs/src/davdoc.css Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/davdoc.css Thu Aug 03 18:29:00 2017 +0200 @@ -28,14 +28,14 @@ div.nav { color: black; - background-color: #E9EBEC; + background-color: #d2d2d2; margin-bottom: 1em; padding-bottom: 0.1em; } div.nav h3 { color: white; - background-color: #5B6F7A; + background-color: #1a3300; font-size: 1.2em; padding-top: 0.2em; padding-bottom: 0.2em; @@ -59,7 +59,7 @@ div.content h1 { color: white; - background-color: #5B6F7A; + background-color: #1a3300; font-size: 1.2em; padding-top: 0.2em; padding-bottom: 0.2em;
--- a/docs/src/encryption.md Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/encryption.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,46 @@ +Encryption +========== + +The davutils programs have an integrated client-side encryption feature, that allows you to encrypt and decrypt on the fly with AES256 or AES128. To use this feature, the server **must** support WebDAV dead properties. + +The tools support both, encryption of the resource content and encryption of the resource name. Each resource is encrypted separately. With activated name encryption, the actual resource name is random but the name used by the client is stored encrypted in WebDAV properties. This means, an attacker can see the directory structure and the file length, but can't see which files have the same name. + +To enable encryption a key must be configured in `$HOME/.dav/config.xml`. A key must have an unique name. To access encrypted resources, all clients must configure the same key with the same name. Currently a key can only be loaded from a file and not generated from a password. + +A configuration for a key looks like: + + <key> + <name>mykey1</name> + <file>keys/mykey1</file> + </key> + +The file path must be relative to `$HOME/.dav/`. In this example the file `$HOME/.dav/keys/mykey1` is loaded. + +To generate a key use **`dd`** on unix like systems. + + dd if=/dev/random of=mykey1 bs=32 count=1 + +After a key is configured, you can enable encryption/decryption in two ways. You can use the dav option **`-c`** to enable encryption and specify your key with the **`-k`** option. The alternative is to enable encryption by default for a repository in the config.xml file. + + <repository> + <name>myrepo</name> + <url>http://example.com/webdav/</url> + + <default-key>mykey1</default-key> + <full-encryption>true</full-encryption> + </repository> + +See [Configuration][1] for details. + +[1]: ./configuration.html + +Internals +--------- + +When a resource is encrypted, some crypto properties (namespace: http://davutils.org/) are set for the resource. + + - crypto-key: Contains the name of the key used for encryption. The presence of this property indicates that the resource is encrypted + - crypto-hash: A Hash of the cleartext, encrypted and base64 encoded + - crypto-name: The name of the resource, encrypted and base64 encoded. This property is not used if name encryption is disabled. + +
--- a/docs/src/getting-started.md Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/getting-started.md Thu Aug 03 18:29:00 2017 +0200 @@ -39,6 +39,7 @@ Added repository: myserv (http://example.com/webdav/) -You can also configure the config.xml yourself, check out this example page and the config.xml spec. +You can also configure the config.xml yourself, check out [the config.xml spec][1]. -More informations about urls and path in dav here. +[1]: ./configuration.html +
--- a/docs/src/header.html Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/header.html Thu Aug 03 18:29:00 2017 +0200 @@ -32,7 +32,21 @@ <div class="nav"> <h3>dav-sync</h3> <ul> - <li><a href=".">.</a></li> + <li><a href="introduction.html">Introduction</a></li> + <li><a href="sync-commands.html">Commands</a></li> + <ul> + <li><a href="pull.html">pull</a></li> + <li><a href="push.html">push</a></li> + <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> + <li><a href="delete-conflicts.html">delete-conflicts</a></li> + <li><a href="trash-info.html">trash-info</a></li> + <li><a href="empty-trash.html">empty-trash</a></li> + <li><a href="add-directory.html">add-directory</a></li> + <li><a href="list-directories.html">list-directories</a></li> + <li><a href="sync-check-config.html">check-config</a></li> + <li><a href="check-repositories.html">check-repositories</a></li> + </ul> + <li><a href="sync-configuration.html">Configuration</a></li> </ul> </div> </div>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/list-directories.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,6 @@ +dav-sync list-directories +===================== + +This command lists all configured sync-directories. + +**Command alias:** list-dirs
--- a/docs/src/list-repositories.md Thu Aug 03 14:32:36 2017 +0200 +++ b/docs/src/list-repositories.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,6 @@ +dav list-repositories +===================== + +This command lists all configured repositories. + +**Command alias:** list-repos
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/pull.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,18 @@ +dav-sync pull +============= + +**`pull [-cld] <directory>`** + +Pulls all changes from the server. All new or modified files are downloaded and all files deleted on the server are deleted locally. If a file is also locally modified and conflict detection is not disabled, the local file is renamed and an entry in the conflict database is added. + +When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory. + +When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash. + +**`-c`** Disable conflict detection. This always overrides locally modified files + +**`-l`** Lock the repository before accessing it. After `pull` completed, the repository is unlocked + +**`-d`** Don't lock the repository + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/push.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,14 @@ +dav-sync push +============= + +**`push [-cld] <directory>`** + +Pushes all local changes to the server. This uploads all locally modified files and deletes all locally deleted files on the server. + +If conflict detection is not disabled, all files that are also modified on the server will be skipped. + +**`-c`** Disable conflict detection. This always overrides files on the server + +**`-l`** Lock the repository before accessing it. After `push` completed, the repository is unlocked + +**`-d`** Don't lock the repository
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/sync-check-config.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,4 @@ +dav-sync check-config +===================== + +Validates the sync.xml file. If the config is ok, it prints Configuration OK. on stdout and returns 0, otherwise it prints an error message on stderr and returns 1.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/docs/src/sync-commands.md Thu Aug 03 18:29:00 2017 +0200 @@ -0,0 +1,19 @@ +Commands +======== + +All commands expect a `<directory>` argument, which is the identifer of a local directory that should be synchronized. The directory must be configured in sync.xml. See [Configuration][1]. + +[1]: ./sync-configuration.html + +Common Commands +--------------- + +Get resources from the server, which are modified since last sync: + + dav pull <directory> + +Upload all locally modified resources: + + dav push <directory> + +
