mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,277 Commits 9 Branches 137 Tags 57 MiB
Commit Graph

2277 Commits

Author SHA1 Message Date
enkore 3bc22061f7 Merge pull request #975 from enkore/feature/paranoid-check 
check: support integrity verification
 2016-05-13 23:17:29 +02:00
Marian Beermann 0bceaf0736
check: support integrity verification with --verify-data 2016-05-13 22:50:36 +02:00
enkore 0e8bd0ac6d Merge pull request #912 from enkore/stuff/decrypt-integrity-test 
decrypt integrity test + some other tests
 2016-05-13 22:31:49 +02:00
Marian Beermann ad5ae32cc4
testsuite/key: Use pytest built-in fixture 2016-05-13 22:07:20 +02:00
Marian Beermann 6a15e8d138 testsuite/key: environment_variable -> monkeypatch.setenv 2016-05-13 22:07:18 +02:00
Marian Beermann c6f7866e35 testsuite/key: add TestPassphrase 2016-05-13 22:07:18 +02:00
Marian Beermann e5356b7f66 testsuite/key: port to pytest, test_decrypt_integrity w/ 'carpet bombing' 2016-05-13 22:07:18 +02:00
Marian Beermann dece06fba9 KeyTestCase, test_decrypt_integrity 2016-05-13 22:07:18 +02:00
Marian Beermann 037d54e442 ArchiverTestCase, test_symlink_extract 2016-05-13 22:07:18 +02:00
enkore d4225f7dda Merge pull request #1032 from ThomasWaldmann/remove-openssl-random 
remove openssl RAND_bytes from crypto.pyx
 2016-05-09 07:51:28 +02:00
Thomas Waldmann 595e7c1dcd remove openssl RAND_bytes from crypto.pyx 
was forgotten there and not used any more since a while.

also removed the hint about PyCrypto being an alternative to crypto.pyx,
it was not updated since 2014, looks pretty stale.
 2016-05-09 04:14:50 +02:00
TW 6222ec98ed Merge pull request #1029 from ThomasWaldmann/prune-fix-indexerror 
prune: fix IndexError
 2016-05-07 21:26:37 +02:00
Thomas Waldmann a44e131661 prune: fix IndexError 
if giving --prefix resulted in an empty archives_checkpoints list, it crashed with an IndexError.
 2016-05-07 21:03:31 +02:00
TW 2cc117f4b0 Merge pull request #1028 from ThomasWaldmann/improve-example-script 
improve backup example script, fixes #1020
 2016-05-07 20:41:53 +02:00
TW 7214c36ac2 Merge pull request #1023 from ThomasWaldmann/use-clean-lines 
load_excludes: reuse existing clean_lines function
 2016-05-07 20:41:30 +02:00
TW 7cd8793e43 Merge pull request #1026 from ThomasWaldmann/improve-extract-docs 
better help / docs for borg extract --dry-run, fixes #1022
 2016-05-07 19:24:07 +02:00
Thomas Waldmann 06caee2ed0 improve backup example script, fixes #1020 2016-05-07 19:22:48 +02:00
TW 512e7ec18a Merge pull request #1025 from ThomasWaldmann/remove-tabs 
_chunker.c: remove tab characters
 2016-05-07 18:54:58 +02:00
Thomas Waldmann d2988444c0 better help / docs for borg extract --dry-run, fixes #1022 2016-05-07 18:53:58 +02:00
Thomas Waldmann 61a73f5f91 _chunker.c: remove tab characters 
always use 4 spaces for indenting.
 2016-05-07 18:18:40 +02:00
Thomas Waldmann ee8f753946 load_excludes: reuse existing clean_lines function 2016-05-07 17:02:09 +02:00
TW 18263f6257 Merge pull request #1019 from ThomasWaldmann/pkgsrc-osx-prefix 
seek /opt/pkg (pkgsrc OS X) for openssl and lz4
 2016-05-06 17:04:51 +02:00
Thomas Waldmann 0fa663febe seek /opt/pkg (pkgsrc OS X) for openssl and lz4 
Add /opt/pkg (used by pkgsrc on Mac OS X) to possible openssl and
lz4 header path.

    from 2015Q2 onwards the prefix has changed to /opt/pkg
    in order to be compatible with El Capitan's
    "System Integrity Protection" feature.

-- pkgsrc.joynet.com

thanks to @weakish for finding this!
 2016-05-06 14:56:54 +02:00
TW d22bbe17c5 Merge pull request #1015 from ThomasWaldmann/checkpoint-docs 
faq: be more detailed about how checkpoints work, fixes #994
 2016-05-05 19:13:18 +02:00
Thomas Waldmann 4c52fcffcc faq: be more detailed about how checkpoints work, fixes #994 2016-05-05 18:59:03 +02:00
TW 571329e6ae Merge pull request #1013 from ThomasWaldmann/docs-fix-issue-links 
faq: fix issue links
 2016-05-05 18:31:04 +02:00
TW 6e12d9c92d Merge pull request #1012 from ThomasWaldmann/append-only-docs 
FAQ: add entries about compromised machines and other troubles, fixes #1011
 2016-05-05 18:30:20 +02:00
Thomas Waldmann 619654b802 faq: fix issue links 2016-05-05 18:16:32 +02:00
Thomas Waldmann 8304b8a591 FAQ: add entries about compromised machines and other troubles 
also: fix append-only mode description - "multiple machines" and "central server" are over-specific and not required for this scenario.
 2016-05-05 17:52:31 +02:00
TW 37de94e532 Merge pull request #1008 from ThomasWaldmann/cleanup-checkpoints 
prune: kill all checkpoints except the latest, fixes #998
 2016-05-05 15:38:23 +02:00
Thomas Waldmann dabf816364 prune: cleanup checkpoints 
kill all the checkpoints when pruning, except the latest one which might be
useful for continuing an interrupted backup. kill the latest checkpoint also
if it is already superceded by a successful backup.

note: this only works on checkpoints matched by --prefix, other checkpoints
      are not touched.
 2016-05-05 15:15:14 +02:00
Thomas Waldmann 39c0757020 Merge branch '1.0-maint' 2016-05-05 13:55:38 +02:00
TW f9638645d1 Merge pull request #996 from ThomasWaldmann/update-1.0-docs 
update CHANGES in 1.0-maint
 2016-05-05 13:51:59 +02:00
TW 6ae1999ff3 Merge pull request #1010 from ThomasWaldmann/doc-tags 
borg create help: document format tags, fixes #894
 2016-05-05 13:49:21 +02:00
Thomas Waldmann 7457c0f5da update CHANGES in 1.0-maint 2016-05-05 13:43:40 +02:00
Thomas Waldmann 9e09786b33 borg create help: document format tags, fixes #894 
docs: rephrased, more useful examples
 2016-05-05 13:38:08 +02:00
Thomas Waldmann f070e2313d Merge branch '1.0-maint' 2016-05-03 22:07:12 +02:00
TW 61b4a56025 Merge pull request #1007 from ThomasWaldmann/compression-predictor 
compression heuristics based on lz4, fixes #1006
 2016-05-03 20:34:56 +02:00
Thomas Waldmann f44b4bb9b7 travis / OSX: add xz package for python lzma support 2016-05-03 19:57:44 +02:00
Thomas Waldmann 75b3e786ed implement compression heuristics based on lz4-compressibility, fixes #1006 
also: add some tests that invoke all supported compression algorithms
 2016-05-03 19:57:44 +02:00
TW 5ec627bc9b Merge pull request #990 from ThomasWaldmann/with-lock 
borg with-lock REPO CMD ARGS
 2016-05-03 00:21:05 +02:00
Thomas Waldmann 962c2e9d54 borg with-lock REPO CMD ARGS 2016-05-02 23:29:17 +02:00
TW 21f753816d Merge pull request #1000 from ThomasWaldmann/prune-ignore-checkpoints 
borg prune: ignore checkpoints, fixes #997
 2016-05-02 01:26:06 +02:00
TW 12fb137667 Merge pull request #1001 from ThomasWaldmann/env-borg-key-file 
add BORG_KEY_FILE
 2016-05-02 01:22:10 +02:00
Thomas Waldmann b743fd09ab borg prune: ignore checkpoints, fixes #997 
also:
- add a test for this
- add some words to borg create help about the archive name
 2016-05-02 01:12:15 +02:00
Thomas Waldmann e7ca74fbef move BORG_KEY_FILE closer to BORG_KEYS_DIR 2016-05-02 00:38:16 +02:00
Thomas Waldmann 0bdc757bbf add tests for BORG_KEY_FILE env var 2016-05-01 22:10:29 +02:00
Félix Sipma a5ba0abe42 support new env var 'BORG_KEY_FILE' 2016-05-01 21:15:09 +02:00
Thomas Waldmann b641d11e1b Merge branch '1.0-maint' 2016-05-01 20:28:17 +02:00
Thomas Waldmann 240e5696b7 fix vagrant ssh syntax, fixes #999 2016-05-01 20:18:17 +02:00