diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-05 00:09:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-05 00:09:11 -0400 |
| commit | 94718242872b9c17ccc1e4888328b124cb02dcac (patch) | |
| tree | b46d29358889081d3d28f3c8a6190b97371cb030 /doc/special_remotes/webdav.mdwn | |
| parent | 48e7a83f8613690432f100886760135cfa3b5b0f (diff) | |
| parent | 2f3b108d49c534e828cec8adceef7defc942b67f (diff) | |
Merge branch 'encryption'
Diffstat (limited to 'doc/special_remotes/webdav.mdwn')
| -rw-r--r-- | doc/special_remotes/webdav.mdwn | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/doc/special_remotes/webdav.mdwn b/doc/special_remotes/webdav.mdwn index 383fddf75..251075b09 100644 --- a/doc/special_remotes/webdav.mdwn +++ b/doc/special_remotes/webdav.mdwn @@ -10,13 +10,10 @@ can read inside the local git repository. A number of parameters can be passed to `git annex initremote` to configure the webdav remote. -* `encryption` - Required. Either "none" to disable encryption (not recommended), - or a value that can be looked up (using gpg -k) to find a gpg encryption - key that will be given access to the remote, or "shared" which allows - every clone of the repository to access the encrypted data (use with caution). +* `encryption` - One of "none", "hybrid", "shared", or "pubkey". + See [[encryption]]. - Note that additional gpg keys can be given access to a remote by - running enableremote with the new key id. See [[encryption]]. +* `keyid` - Specifies the gpg key to use for [[encryption]]. * `embedcreds` - Optional. Set to "yes" embed the login credentials inside the git repository, which allows other clones to also access them. This is @@ -42,4 +39,4 @@ the webdav remote. Setup example: - # WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://www.box.com/dav/git-annex chunksize=75mb encryption=joey@kitenet.net + # WEBDAV_USERNAME=joey@kitenet.net WEBDAV_PASSWORD=xxxxxxx git annex initremote box.com type=webdav url=https://www.box.com/dav/git-annex chunksize=75mb keyid=joey@kitenet.net |