Merge lp:~ed.so/duplicity/man.page into lp:duplicity/0.6
- man.page
- Merge into 0.6-series
Proposed by
edso
Status: | Merged |
---|---|
Merged at revision: | 925 |
Proposed branch: | lp:~ed.so/duplicity/man.page |
Merge into: | lp:duplicity/0.6 |
Diff against target: |
481 lines (+142/-104) 1 file modified
bin/duplicity.1 (+142/-104) |
To merge this branch: | bzr merge lp:~ed.so/duplicity/man.page |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
duplicity-team | Pending | ||
Review via email: mp+180734@code.launchpad.net |
Commit message
Description of the change
update paramiko links
add command parameters to synopsis
add --compare-data
some polishing
several improvements
To post a comment you must log in.
Revision history for this message
Kenneth Loafman (kenneth-loafman) wrote : | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'bin/duplicity.1' | |||
2 | --- bin/duplicity.1 2013-08-17 18:34:48 +0000 | |||
3 | +++ bin/duplicity.1 2013-08-18 14:20:30 +0000 | |||
4 | @@ -9,12 +9,15 @@ | |||
5 | 9 | duplicity \- Encrypted incremental backup to local or remote storage. | 9 | duplicity \- Encrypted incremental backup to local or remote storage. |
6 | 10 | 10 | ||
7 | 11 | .SH SYNOPSIS | 11 | .SH SYNOPSIS |
8 | 12 | For detailed descriptions for each command see chapter | ||
9 | 13 | .BR ACTIONS . | ||
10 | 14 | |||
11 | 12 | .B duplicity [full|incremental] | 15 | .B duplicity [full|incremental] |
12 | 13 | .I [options] | 16 | .I [options] |
13 | 14 | source_directory target_url | 17 | source_directory target_url |
14 | 15 | 18 | ||
15 | 16 | .B duplicity verify | 19 | .B duplicity verify |
17 | 17 | .I [options] [--file-to-restore <relpath>] | 20 | .I [options] [--compare-data] [--file-to-restore <relpath>] [--time time] |
18 | 18 | source_url target_directory | 21 | source_url target_directory |
19 | 19 | 22 | ||
20 | 20 | .B duplicity collection-status | 23 | .B duplicity collection-status |
21 | @@ -54,19 +57,16 @@ | |||
22 | 54 | Some backends also require additional components (probably available as packages for your specific platform): | 57 | Some backends also require additional components (probably available as packages for your specific platform): |
23 | 55 | .TP | 58 | .TP |
24 | 56 | .BR "boto backend" " (S3 Amazon Web Services, Google Cloud Storage)" | 59 | .BR "boto backend" " (S3 Amazon Web Services, Google Cloud Storage)" |
26 | 57 | .B boto | 60 | .B boto version 2.0+ |
27 | 58 | - http://github.com/boto/boto | 61 | - http://github.com/boto/boto |
28 | 59 | .TP | 62 | .TP |
29 | 60 | .BR "cloudfiles backend" " (e.g. Rackspace Open Cloud)" | 63 | .BR "cloudfiles backend" " (e.g. Rackspace Open Cloud)" |
30 | 61 | .B Cloud Files Python API | 64 | .B Cloud Files Python API |
31 | 62 | - http://www.rackspace.com/knowledge_center/article/python-api-installation-for-cloud-files | 65 | - http://www.rackspace.com/knowledge_center/article/python-api-installation-for-cloud-files |
32 | 63 | .TP | 66 | .TP |
39 | 64 | .BR "OpenStack Swift backend" | 67 | .B "dpbx backend" (Dropbox) |
40 | 65 | .B Python swiftclient module | 68 | .B Dropbox Python SDK |
41 | 66 | - https://github.com/openstack/python-swiftclient/ | 69 | - https://www.dropbox.com/developers/reference/sdk |
36 | 67 | .br | ||
37 | 68 | .B Python keystoneclient module | ||
38 | 69 | - https://github.com/openstack/python-keystoneclient/ | ||
42 | 70 | .TP | 70 | .TP |
43 | 71 | .B "ftp backend" | 71 | .B "ftp backend" |
44 | 72 | .B NcFTP Client | 72 | .B NcFTP Client |
45 | @@ -99,7 +99,7 @@ | |||
46 | 99 | .BR "ssh paramiko backend" " (enabled by default)" | 99 | .BR "ssh paramiko backend" " (enabled by default)" |
47 | 100 | .B paramiko | 100 | .B paramiko |
48 | 101 | (SSH2 for python) | 101 | (SSH2 for python) |
50 | 102 | - http://www.lag.net/paramiko/ | 102 | - http://pypi.python.org/pypi/paramiko (downloads); http://github.com/paramiko/paramiko (project page) |
51 | 103 | .br | 103 | .br |
52 | 104 | .B pycrypto | 104 | .B pycrypto |
53 | 105 | (Python Cryptography Toolkit) | 105 | (Python Cryptography Toolkit) |
54 | @@ -109,6 +109,13 @@ | |||
55 | 109 | .B sftp/scp client binaries | 109 | .B sftp/scp client binaries |
56 | 110 | OpenSSH - http://www.openssh.com/ | 110 | OpenSSH - http://www.openssh.com/ |
57 | 111 | .TP | 111 | .TP |
58 | 112 | .BR "swift backend (OpenStack Object Storage)" | ||
59 | 113 | .B Python swiftclient module | ||
60 | 114 | - https://github.com/openstack/python-swiftclient/ | ||
61 | 115 | .br | ||
62 | 116 | .B Python keystoneclient module | ||
63 | 117 | - https://github.com/openstack/python-keystoneclient/ | ||
64 | 118 | .TP | ||
65 | 112 | .B "Ubuntu One" | 119 | .B "Ubuntu One" |
66 | 113 | .B httplib2 | 120 | .B httplib2 |
67 | 114 | (python HTTP client library) | 121 | (python HTTP client library) |
68 | @@ -125,23 +132,17 @@ | |||
69 | 125 | .br | 132 | .br |
70 | 126 | (also see | 133 | (also see |
71 | 127 | .BR "A NOTE ON SSL CERTIFICATE VERIFICATION" ). | 134 | .BR "A NOTE ON SSL CERTIFICATE VERIFICATION" ). |
72 | 128 | .TP | ||
73 | 129 | .B "dpbx backend" | ||
74 | 130 | .B Dropbox Python SDK | ||
75 | 131 | - https://www.dropbox.com/developers/reference/sdk | ||
76 | 132 | .br | ||
77 | 133 | 135 | ||
78 | 134 | .SH DESCRIPTION | 136 | .SH DESCRIPTION |
82 | 135 | Duplicity incrementally backs up files and directory | 137 | Duplicity incrementally backs up files and folders into |
83 | 136 | by encrypting tar-format volumes with GnuPG and uploading them to a | 138 | tar-format volumes encrypted with GnuPG and places them to a |
84 | 137 | remote (or local) file server. See | 139 | remote (or local) storage backend. See chapter |
85 | 138 | .B URL FORMAT | 140 | .B URL FORMAT |
92 | 139 | for a list all supported backends and how to address them. | 141 | for a list of all supported backends and how to address them. |
93 | 140 | Because duplicity uses | 142 | Because duplicity uses librsync, incremental backups are space efficient |
94 | 141 | librsync, the incremental archives are space efficient and only record | 143 | and only record the parts of files that have changed since the last backup. |
95 | 142 | the parts of files that have changed since the last backup. Currently | 144 | Currently duplicity supports deleted files, full Unix permissions, uid/gid, |
96 | 143 | duplicity supports deleted files, full Unix permissions, uid/gid, directories, | 145 | directories, symbolic links, fifos, etc., but not hard links. |
91 | 144 | symbolic links, fifos, etc., but not hard links. | ||
97 | 145 | 146 | ||
98 | 146 | If you are backing up the root directory /, remember to --exclude | 147 | If you are backing up the root directory /, remember to --exclude |
99 | 147 | /proc, or else duplicity will probably crash on the weird stuff in | 148 | /proc, or else duplicity will probably crash on the weird stuff in |
100 | @@ -156,7 +157,7 @@ | |||
101 | 156 | .PP | 157 | .PP |
102 | 157 | .RE | 158 | .RE |
103 | 158 | If the above is run repeatedly, the first will be a full backup, and | 159 | If the above is run repeatedly, the first will be a full backup, and |
105 | 159 | subsequent ones will be incremental. To force a full backup, use the | 160 | subsequent ones will be incremental. To force a full backup, use the |
106 | 160 | .I full | 161 | .I full |
107 | 161 | action: | 162 | action: |
108 | 162 | .PP | 163 | .PP |
109 | @@ -164,6 +165,14 @@ | |||
110 | 164 | duplicity full /home/me sftp://uid@other.host/some_dir | 165 | duplicity full /home/me sftp://uid@other.host/some_dir |
111 | 165 | .PP | 166 | .PP |
112 | 166 | .RE | 167 | .RE |
113 | 168 | or enforcing a full every other time via | ||
114 | 169 | .I --full-if-older-than <time> | ||
115 | 170 | , e.g. a full every month: | ||
116 | 171 | .PP | ||
117 | 172 | .RS | ||
118 | 173 | duplicity --full-if-older-than 1M /home/me sftp://uid@other.host/some_dir | ||
119 | 174 | .PP | ||
120 | 175 | .RE | ||
121 | 167 | Now suppose we accidentally delete /home/me and want to restore it | 176 | Now suppose we accidentally delete /home/me and want to restore it |
122 | 168 | the way it was at the time of last backup: | 177 | the way it was at the time of last backup: |
123 | 169 | .PP | 178 | .PP |
124 | @@ -179,8 +188,7 @@ | |||
125 | 179 | duplicity -t 3D --file-to-restore Mail/article sftp://uid@other.host/some_dir /home/me/restored_file | 188 | duplicity -t 3D --file-to-restore Mail/article sftp://uid@other.host/some_dir /home/me/restored_file |
126 | 180 | .PP | 189 | .PP |
127 | 181 | .RE | 190 | .RE |
130 | 182 | The following command compares the files we backed up, so see what has | 191 | The following command compares the latest backup with the current files: |
129 | 183 | changed since then: | ||
131 | 184 | .PP | 192 | .PP |
132 | 185 | .RS | 193 | .RS |
133 | 186 | duplicity verify sftp://uid@other.host/some_dir /home/me | 194 | duplicity verify sftp://uid@other.host/some_dir /home/me |
134 | @@ -213,6 +221,7 @@ | |||
135 | 213 | 221 | ||
136 | 214 | .SH ACTIONS | 222 | .SH ACTIONS |
137 | 215 | Duplicity knows action commands, which can be finetuned with options. | 223 | Duplicity knows action commands, which can be finetuned with options. |
138 | 224 | .br | ||
139 | 216 | The actions for backup (full,incr) and restoration (restore) can as well be | 225 | The actions for backup (full,incr) and restoration (restore) can as well be |
140 | 217 | left out as duplicity detects in what mode it should switch to by the order | 226 | left out as duplicity detects in what mode it should switch to by the order |
141 | 218 | of target URL and local folder. If the target URL comes before the local folder | 227 | of target URL and local folder. If the target URL comes before the local folder |
142 | @@ -221,24 +230,47 @@ | |||
143 | 221 | .br | 230 | .br |
144 | 222 | If a backup is in order and old signatures can be found duplicity automatically | 231 | If a backup is in order and old signatures can be found duplicity automatically |
145 | 223 | performs an incremental backup. | 232 | performs an incremental backup. |
146 | 233 | .PP | ||
147 | 234 | .B Note: | ||
148 | 235 | The following explanations explain some but | ||
149 | 236 | .B not | ||
150 | 237 | all options that can be used in connection with that action command. | ||
151 | 238 | Consult the OPTIONS section for more detailed informations. | ||
152 | 224 | 239 | ||
153 | 225 | .TP | 240 | .TP |
155 | 226 | .B full | 241 | .BI "full " "<folder> <url>" |
156 | 227 | Perform a full backup. A new backup chain is started even if | 242 | Perform a full backup. A new backup chain is started even if |
157 | 228 | signatures are available for an incremental backup. | 243 | signatures are available for an incremental backup. |
158 | 229 | 244 | ||
159 | 230 | .TP | 245 | .TP |
161 | 231 | .BR incr | 246 | .BI "incr " "<folder> <url>" |
162 | 232 | If this is requested an incremental backup will be performed. | 247 | If this is requested an incremental backup will be performed. |
163 | 233 | Duplicity will abort if no old signatures can be found. | 248 | Duplicity will abort if no old signatures can be found. |
164 | 234 | 249 | ||
165 | 235 | .TP | 250 | .TP |
167 | 236 | .B collection-status | 251 | .BI "verify " "[--compare-data] [--time <time>] [--file-to-restore <relpath>] <url> <folder>" |
168 | 252 | Verify compares the backup contents with the source folder. | ||
169 | 253 | duplicity will exit with a non-zero error level if any files are different. | ||
170 | 254 | On verbosity level info (4) or higher, a message for each file that has | ||
171 | 255 | changed will be logged. | ||
172 | 256 | .br | ||
173 | 257 | The | ||
174 | 258 | .I --file-to-restore | ||
175 | 259 | option restricts verify to that file or folder. | ||
176 | 260 | The | ||
177 | 261 | .I --time | ||
178 | 262 | option allows to select a backup to verify against. | ||
179 | 263 | The | ||
180 | 264 | .I --compare-data | ||
181 | 265 | option enables data comparison (see below). | ||
182 | 266 | |||
183 | 267 | .TP | ||
184 | 268 | .BI "collection-status " "<url>" | ||
185 | 237 | Summarize the status of the backup repository by printing the chains | 269 | Summarize the status of the backup repository by printing the chains |
186 | 238 | and sets found, and the number of volumes in each. | 270 | and sets found, and the number of volumes in each. |
187 | 239 | 271 | ||
188 | 240 | .TP | 272 | .TP |
190 | 241 | .BI "list-current-files " "[--time <time>]" | 273 | .BI "list-current-files " "[--time <time>] <url>" |
191 | 242 | Lists the files contained in the most current backup or backup at time. | 274 | Lists the files contained in the most current backup or backup at time. |
192 | 243 | The information will be extracted from the signature files, not the archive data | 275 | The information will be extracted from the signature files, not the archive data |
193 | 244 | itself. Thus the whole archive does not have to be downloaded, but on | 276 | itself. Thus the whole archive does not have to be downloaded, but on |
194 | @@ -246,15 +278,7 @@ | |||
195 | 246 | command will not detect it. | 278 | command will not detect it. |
196 | 247 | 279 | ||
197 | 248 | .TP | 280 | .TP |
207 | 249 | .BI "verify " "[--file-to-restore <relpath>]" | 281 | .BI "restore " "[--file-to-restore <relpath>] [--time <time>] <url> <target_folder>" |
199 | 250 | Enter verify mode instead of restore. If the --file-to-restore option | ||
200 | 251 | is given, restrict verify to that file or directory. duplicity will | ||
201 | 252 | exit with a non-zero error level if any files are different. On | ||
202 | 253 | verbosity level 4 or higher, log a message for each file that has | ||
203 | 254 | changed. | ||
204 | 255 | |||
205 | 256 | .TP | ||
206 | 257 | .BI "restore " "[--file-to-restore <relpath>] [--time <time>]" | ||
208 | 258 | You can restore the full monty or selected folders/files from a specific time. | 282 | You can restore the full monty or selected folders/files from a specific time. |
209 | 259 | Use the relative path as it is printed by | 283 | Use the relative path as it is printed by |
210 | 260 | .BR list-current-files . | 284 | .BR list-current-files . |
211 | @@ -262,7 +286,7 @@ | |||
212 | 262 | comes before the local folder. | 286 | comes before the local folder. |
213 | 263 | 287 | ||
214 | 264 | .TP | 288 | .TP |
216 | 265 | .BI "remove-older-than " time | 289 | .BI "remove-older-than " "<time> [--force] <url>" |
217 | 266 | Delete all backup sets older than the given time. Old backup sets | 290 | Delete all backup sets older than the given time. Old backup sets |
218 | 267 | will not be deleted if backup sets newer than | 291 | will not be deleted if backup sets newer than |
219 | 268 | .I time | 292 | .I time |
220 | @@ -271,10 +295,10 @@ | |||
221 | 271 | section for more information. Note, this action cannot be combined | 295 | section for more information. Note, this action cannot be combined |
222 | 272 | with backup or other actions, such as cleanup. Note also that | 296 | with backup or other actions, such as cleanup. Note also that |
223 | 273 | .I --force | 297 | .I --force |
225 | 274 | will be needed to delete the files rather than just list them. | 298 | will be needed to delete the files instead of just listing them. |
226 | 275 | 299 | ||
227 | 276 | .TP | 300 | .TP |
229 | 277 | .BI "remove-all-but-n-full " count | 301 | .BI "remove-all-but-n-full " "<count> [--force] <url>" |
230 | 278 | Delete all backups sets that are older than the count:th last full | 302 | Delete all backups sets that are older than the count:th last full |
231 | 279 | backup (in other words, keep the last | 303 | backup (in other words, keep the last |
232 | 280 | .I count | 304 | .I count |
233 | @@ -283,26 +307,26 @@ | |||
234 | 283 | must be larger than zero. A value of 1 means that only the single most | 307 | must be larger than zero. A value of 1 means that only the single most |
235 | 284 | recent backup chain will be kept. Note that | 308 | recent backup chain will be kept. Note that |
236 | 285 | .I --force | 309 | .I --force |
238 | 286 | will be needed to delete the files rather than just list them. | 310 | will be needed to delete the files instead of just listing them. |
239 | 287 | 311 | ||
240 | 288 | .TP | 312 | .TP |
242 | 289 | .BI "remove-all-inc-of-but-n-full " count | 313 | .BI "remove-all-inc-of-but-n-full " "<count> [--force] <url>" |
243 | 290 | Delete incremental sets of all backups sets that are older than the count:th last full | 314 | Delete incremental sets of all backups sets that are older than the count:th last full |
244 | 291 | backup (in other words, keep only old full backups and not their increments). | 315 | backup (in other words, keep only old full backups and not their increments). |
245 | 292 | .I count | 316 | .I count |
246 | 293 | must be larger than zero. A value of 1 means that only the single most | 317 | must be larger than zero. A value of 1 means that only the single most |
247 | 294 | recent backup chain will be kept intact. Note that | 318 | recent backup chain will be kept intact. Note that |
248 | 295 | .I --force | 319 | .I --force |
250 | 296 | will be needed to delete the files rather than just list them. | 320 | will be needed to delete the files instead of just listing them. |
251 | 297 | 321 | ||
252 | 298 | .TP | 322 | .TP |
254 | 299 | .B cleanup | 323 | .BI "cleanup " "[--force] [--extra-clean] <url>" |
255 | 300 | Delete the extraneous duplicity files on the given backend. | 324 | Delete the extraneous duplicity files on the given backend. |
256 | 301 | Non-duplicity files, or files in complete data sets will not be | 325 | Non-duplicity files, or files in complete data sets will not be |
257 | 302 | deleted. This should only be necessary after a duplicity session | 326 | deleted. This should only be necessary after a duplicity session |
258 | 303 | fails or is aborted prematurely. Note that | 327 | fails or is aborted prematurely. Note that |
259 | 304 | .I --force | 328 | .I --force |
261 | 305 | will be needed to delete the files rather than just list them. | 329 | will be needed to delete the files instead of just listing them. |
262 | 306 | 330 | ||
263 | 307 | .SH OPTIONS | 331 | .SH OPTIONS |
264 | 308 | 332 | ||
265 | @@ -374,6 +398,11 @@ | |||
266 | 374 | enough storage space is required to store two volumes. | 398 | enough storage space is required to store two volumes. |
267 | 375 | 399 | ||
268 | 376 | .TP | 400 | .TP |
269 | 401 | .B --compare-data | ||
270 | 402 | Enable data comparison of regular files on action verify. | ||
271 | 403 | This is disabled by default for performance reasons. | ||
272 | 404 | |||
273 | 405 | .TP | ||
274 | 377 | .BI "--dry-run " | 406 | .BI "--dry-run " |
275 | 378 | Calculate what would be done, but do not perform any backend actions | 407 | Calculate what would be done, but do not perform any backend actions |
276 | 379 | 408 | ||
277 | @@ -670,7 +699,7 @@ | |||
278 | 670 | option). Default is to prompt the status each 3 seconds. | 699 | option). Default is to prompt the status each 3 seconds. |
279 | 671 | 700 | ||
280 | 672 | .TP | 701 | .TP |
282 | 673 | .BI "--rename " "orig new" | 702 | .BI "--rename " "<original path> <new path>" |
283 | 674 | Treats the path | 703 | Treats the path |
284 | 675 | .I orig | 704 | .I orig |
285 | 676 | in the backup as if it were the path | 705 | in the backup as if it were the path |
286 | @@ -943,7 +972,7 @@ | |||
287 | 943 | it is permitted however. | 972 | it is permitted however. |
288 | 944 | Consider setting the environment variable | 973 | Consider setting the environment variable |
289 | 945 | .B FTP_PASSWORD | 974 | .B FTP_PASSWORD |
291 | 946 | instead, which is used by most, if not all backends, regardless of its name. | 975 | instead, which is used by most, if not all backends, regardless of it's name. |
292 | 947 | .PP | 976 | .PP |
293 | 948 | In protocols that support it, the path may be preceded by a single | 977 | In protocols that support it, the path may be preceded by a single |
294 | 949 | slash, '/path', to represent a relative path to the target home directory, | 978 | slash, '/path', to represent a relative path to the target home directory, |
295 | @@ -958,6 +987,13 @@ | |||
296 | 958 | See also | 987 | See also |
297 | 959 | .B "A NOTE ON CLOUD FILES ACCESS" | 988 | .B "A NOTE ON CLOUD FILES ACCESS" |
298 | 960 | .PP | 989 | .PP |
299 | 990 | .BI Dropbox | ||
300 | 991 | .br | ||
301 | 992 | dpbx:///some_dir | ||
302 | 993 | .br | ||
303 | 994 | Make sure to read | ||
304 | 995 | .BR "A NOTE ON DROPBOX ACCESS" " first!" | ||
305 | 996 | .PP | ||
306 | 961 | file://[relative|/absolute]/local/path | 997 | file://[relative|/absolute]/local/path |
307 | 962 | .PP | 998 | .PP |
308 | 963 | ftp[s]://user[:password]@other.host[:port]/some_dir | 999 | ftp[s]://user[:password]@other.host[:port]/some_dir |
309 | @@ -1005,7 +1041,7 @@ | |||
310 | 1005 | swift://container_name | 1041 | swift://container_name |
311 | 1006 | .br | 1042 | .br |
312 | 1007 | See also | 1043 | See also |
314 | 1008 | .B "A NOTE ON OPENSTACK SWIFT ACCESS" | 1044 | .B "A NOTE ON SWIFT (OPENSTACK OBJECT STORAGE) ACCESS" |
315 | 1009 | .PP | 1045 | .PP |
316 | 1010 | tahoe://alias/directory | 1046 | tahoe://alias/directory |
317 | 1011 | .PP | 1047 | .PP |
318 | @@ -1018,25 +1054,7 @@ | |||
319 | 1018 | See also | 1054 | See also |
320 | 1019 | .BI "A NOTE ON UBUNTU ONE" | 1055 | .BI "A NOTE ON UBUNTU ONE" |
321 | 1020 | .PP | 1056 | .PP |
341 | 1021 | webdav[s]://user[:password]@other.host/some_dir | 1057 | webdav[s]://user[:password]@other.host[:port]/some_dir |
323 | 1022 | .PP | ||
324 | 1023 | .BI Dropbox | ||
325 | 1024 | .br | ||
326 | 1025 | dpbx:///some_dir | ||
327 | 1026 | .br | ||
328 | 1027 | .IP 1. | ||
329 | 1028 | "some_dir" must already exist in the Dropbox Application folder for | ||
330 | 1029 | this application, like "Apps/Duplicity/some_dir". | ||
331 | 1030 | .IP 2. | ||
332 | 1031 | The first run of the backend must be ineractive! | ||
333 | 1032 | It will print the URL that you need to open in the browser to obtain | ||
334 | 1033 | OAuth token for the application. The token will be saved in the file | ||
335 | 1034 | $HOME/.dropbox.token_store.txt and used in the future runs. | ||
336 | 1035 | .IP 3. | ||
337 | 1036 | When using Dropbox for storage, be aware that all files, including the | ||
338 | 1037 | ones in the Apps folder, will be synced to all connected computers. | ||
339 | 1038 | You may prefer to use a separate Dropbox account specially for the | ||
340 | 1039 | backups, and not connect any computers to that account. | ||
342 | 1040 | .RE | 1058 | .RE |
343 | 1041 | 1059 | ||
344 | 1042 | .SH TIME FORMATS | 1060 | .SH TIME FORMATS |
345 | @@ -1172,21 +1190,26 @@ | |||
346 | 1172 | The | 1190 | The |
347 | 1173 | .B --exclude | 1191 | .B --exclude |
348 | 1174 | pattern option matches a file if: | 1192 | pattern option matches a file if: |
350 | 1175 | .IP 1. | 1193 | .PP |
351 | 1194 | .B 1. | ||
352 | 1176 | .I pattern | 1195 | .I pattern |
353 | 1177 | can be expanded into the file's filename, or | 1196 | can be expanded into the file's filename, or |
355 | 1178 | .IP 2. | 1197 | .br |
356 | 1198 | .B 2. | ||
357 | 1179 | the file is inside a directory matched by the option. | 1199 | the file is inside a directory matched by the option. |
358 | 1180 | .PP | 1200 | .PP |
359 | 1181 | Conversely, the | 1201 | Conversely, the |
360 | 1182 | .B "--include " | 1202 | .B "--include " |
361 | 1183 | pattern matches a file if: | 1203 | pattern matches a file if: |
363 | 1184 | .IP 1. | 1204 | .PP |
364 | 1205 | .B 1. | ||
365 | 1185 | .I pattern | 1206 | .I pattern |
366 | 1186 | can be expanded into the file's filename, or | 1207 | can be expanded into the file's filename, or |
368 | 1187 | .IP 2. | 1208 | .br |
369 | 1209 | .B 2. | ||
370 | 1188 | the file is inside a directory matched by the option, or | 1210 | the file is inside a directory matched by the option, or |
372 | 1189 | .IP 3. | 1211 | .br |
373 | 1212 | .B 3. | ||
374 | 1190 | the file is a directory which contains a file matched by the option. | 1213 | the file is a directory which contains a file matched by the option. |
375 | 1191 | .PP | 1214 | .PP |
376 | 1192 | For example, | 1215 | For example, |
377 | @@ -1231,7 +1254,8 @@ | |||
378 | 1231 | interpreted similarly to the way | 1254 | interpreted similarly to the way |
379 | 1232 | .I extended shell patterns | 1255 | .I extended shell patterns |
380 | 1233 | are, with a few exceptions: | 1256 | are, with a few exceptions: |
382 | 1234 | .IP 1. | 1257 | .PP |
383 | 1258 | .B 1. | ||
384 | 1235 | Globbing patterns like | 1259 | Globbing patterns like |
385 | 1236 | .BR * , | 1260 | .BR * , |
386 | 1237 | .BR ** , | 1261 | .BR ** , |
387 | @@ -1239,10 +1263,12 @@ | |||
388 | 1239 | and | 1263 | and |
389 | 1240 | .B [...] | 1264 | .B [...] |
390 | 1241 | are not expanded. | 1265 | are not expanded. |
392 | 1242 | .IP 2. | 1266 | .br |
393 | 1267 | .B 2. | ||
394 | 1243 | Include patterns do not match files in a directory that is included. | 1268 | Include patterns do not match files in a directory that is included. |
395 | 1244 | So /usr/local in an include file will not match /usr/local/doc. | 1269 | So /usr/local in an include file will not match /usr/local/doc. |
397 | 1245 | .IP 3. | 1270 | .br |
398 | 1271 | .B 3. | ||
399 | 1246 | Lines starting with "+ " are interpreted as include directives, even | 1272 | Lines starting with "+ " are interpreted as include directives, even |
400 | 1247 | if found in a filelist referenced by | 1273 | if found in a filelist referenced by |
401 | 1248 | .BR --exclude-filelist . | 1274 | .BR --exclude-filelist . |
402 | @@ -1343,32 +1369,20 @@ | |||
403 | 1343 | .I must | 1369 | .I must |
404 | 1344 | be set in order to use other cloud files providers. | 1370 | be set in order to use other cloud files providers. |
405 | 1345 | 1371 | ||
432 | 1346 | .SH A NOTE ON OPENSTACK SWIFT ACCESS | 1372 | .SH A NOTE ON DROPBOX ACCESS |
433 | 1347 | 1373 | .IP 1. | |
434 | 1348 | Swift is the OpenStack Object Storage service. | 1374 | "some_dir" must already exist in the Dropbox Application folder for |
435 | 1349 | 1375 | this application, like "Apps/Duplicity/some_dir". | |
436 | 1350 | The backend requires python-switclient to be installed on the system. | 1376 | .IP 2. |
437 | 1351 | python-keystoneclient is also needed to use OpenStack's Keystone Identity service. | 1377 | The first run of the backend must be ineractive! |
438 | 1352 | See | 1378 | It will print the URL that you need to open in the browser to obtain |
439 | 1353 | .B REQUIREMENTS | 1379 | OAuth token for the application. The token will be saved in the file |
440 | 1354 | above. | 1380 | $HOME/.dropbox.token_store.txt and used in the future runs. |
441 | 1355 | 1381 | .IP 3. | |
442 | 1356 | It uses four environment variables for authentification: | 1382 | When using Dropbox for storage, be aware that all files, including the |
443 | 1357 | .BR SWIFT_USERNAME " (required)," | 1383 | ones in the Apps folder, will be synced to all connected computers. |
444 | 1358 | .BR SWIFT_PASSWORD " (required)," | 1384 | You may prefer to use a separate Dropbox account specially for the |
445 | 1359 | .BR SWIFT_AUTHURL " (required)," | 1385 | backups, and not connect any computers to that account. |
420 | 1360 | .BR SWIFT_TENANTNAME " (optional, the tenant can be included in the username)" | ||
421 | 1361 | |||
422 | 1362 | If the user was previously authenticated, the following environment | ||
423 | 1363 | variables can be used instead: | ||
424 | 1364 | .BR SWIFT_PREAUTHURL " (required)," | ||
425 | 1365 | .BR SWIFT_PREAUTHTOKEN " (required)" | ||
426 | 1366 | |||
427 | 1367 | If | ||
428 | 1368 | .B SWIFT_AUTHVERSION | ||
429 | 1369 | is unspecified, it will default to version 1. | ||
430 | 1370 | |||
431 | 1371 | |||
446 | 1372 | 1386 | ||
447 | 1373 | .SH A NOTE ON EUROPEAN S3 BUCKETS | 1387 | .SH A NOTE ON EUROPEAN S3 BUCKETS |
448 | 1374 | Amazon S3 provides the ability to choose the location of a bucket upon | 1388 | Amazon S3 provides the ability to choose the location of a bucket upon |
449 | @@ -1529,7 +1543,31 @@ | |||
450 | 1529 | .B --ssl-no-check-certificate | 1543 | .B --ssl-no-check-certificate |
451 | 1530 | option to disable certificate verification alltogether, in case some ssl library | 1544 | option to disable certificate verification alltogether, in case some ssl library |
452 | 1531 | is missing or verification is not wanted. Use it with care, as even with self signed | 1545 | is missing or verification is not wanted. Use it with care, as even with self signed |
454 | 1532 | servers manually providing the private ca certificate is definitely the safer option. | 1546 | servers manually providing the private ca certificate is definitely the safer option. |
455 | 1547 | |||
456 | 1548 | .SH A NOTE ON SWIFT (OPENSTACK OBJECT STORAGE) ACCESS | ||
457 | 1549 | Swift is the OpenStack Object Storage service. | ||
458 | 1550 | .br | ||
459 | 1551 | The backend requires python-switclient to be installed on the system. | ||
460 | 1552 | python-keystoneclient is also needed to use OpenStack's Keystone Identity service. | ||
461 | 1553 | See | ||
462 | 1554 | .B REQUIREMENTS | ||
463 | 1555 | above. | ||
464 | 1556 | |||
465 | 1557 | It uses four environment variables for authentification: | ||
466 | 1558 | .BR SWIFT_USERNAME " (required)," | ||
467 | 1559 | .BR SWIFT_PASSWORD " (required)," | ||
468 | 1560 | .BR SWIFT_AUTHURL " (required)," | ||
469 | 1561 | .BR SWIFT_TENANTNAME " (optional, the tenant can be included in the username)" | ||
470 | 1562 | |||
471 | 1563 | If the user was previously authenticated, the following environment | ||
472 | 1564 | variables can be used instead: | ||
473 | 1565 | .BR SWIFT_PREAUTHURL " (required)," | ||
474 | 1566 | .BR SWIFT_PREAUTHTOKEN " (required)" | ||
475 | 1567 | |||
476 | 1568 | If | ||
477 | 1569 | .B SWIFT_AUTHVERSION | ||
478 | 1570 | is unspecified, it will default to version 1. | ||
479 | 1533 | 1571 | ||
480 | 1534 | .SH A NOTE ON SYMMETRIC ENCRYPTION AND SIGNING | 1572 | .SH A NOTE ON SYMMETRIC ENCRYPTION AND SIGNING |
481 | 1535 | Signing and symmetrically encrypt at the same time with the gpg binary on the | 1573 | Signing and symmetrically encrypt at the same time with the gpg binary on the |
Looking good!