6115cbdace
btrbk: make target_type optional for "target" section
2019-04-24 13:51:52 +02:00
50267f1ca9
documentation: btrbk.conf.5: add warning on old versions of mbuffer
2019-04-24 12:53:19 +02:00
32d92ff3b7
btrbk: allow space separated groups
2019-04-20 14:05:42 +02:00
45b24d6477
documentation: btrbk.1: add "exclude" command line option
2019-04-18 15:09:15 +02:00
14b5edcf68
documentation: btrbk.1: update filter statements section
2019-04-18 15:09:15 +02:00
95819f03ea
documentation: btrbk.1: cosmetics: same order for options in all docs
2019-04-18 15:09:15 +02:00
66004aeae8
documentation: btrbk.conf.5: add "noauto" option
2019-04-18 15:09:15 +02:00
b6da6b0158
documentation: btrbk.conf.5: cosmetics, delete empty line
2019-04-18 15:09:15 +02:00
318126b831
btrbk: disallow unrelated (by parent_uuid) parents for btrfs-send if incremental=strict
...
Makes sure that if, for whatever reason, a subvolume having correct
btrbk name scheme does NOT share any extents with previous snapshots
is never used as parent.
Note that if a related parent is found, the unrelated closest
older/newer (by btrbk timestamp) subvolumes are still added as clone
sources.
2019-04-12 21:03:40 +02:00
44edc97aef
btrbk: add "incremental_clones" configuration option (btrfs-send <clone-src>)
2019-04-05 12:06:41 +02:00
514e69243a
btrbk: add "incremental_resolve" configuration option
...
Allowed values for "incremental_resolve":
- "mountpoint" (default): Use parents in the filesystem tree below
mount points of source `<volume-directory>/<snapshot-dir>` and
target `<target-directory>`.
- "directory": Use parents strictly below source/target
directories. Useful when restricting access, e.g. when using
ssh_filter_btrbk.sh.
- "_all_accessible" (experimental): Use parents from all mount points.
Note that using "_all_accessible" causes btrfs-progs to fail:
- btrfs send -p: "ERROR: not on mount point: /path/to/mountpoint"
- btrfs receive: "ERROR: parent subvol is not reachable from inside the root subvol"
see also: https://github.com/kdave/btrfs-progs/issues/96
2019-04-05 12:05:46 +02:00
2f09a9a723
btrbk: virtual machine setups; use MACHINE_ID for caches; use port in URL
...
Common virtual machine setups have multiple volume sections with same
host, but distinct port numbers for each machine.
- make caches dependent on MACHINE_ID instead of HOST
- append port number to URL
- add MACHINE_ID to vinfo
- use MACHINE_ID where applicable
This even works if virtual machines share the same btrfs filesystems:
If a equal UUID is found on distinct machines, btr_tree() will return
the already present tree, in order to be consistent after node
injections.
2019-04-01 18:43:49 +02:00
d8b7988ffa
btrbk: deprecate ssh_port option in favor of ssh://hostname[:port] notation
...
Setting the ssh port directly in the "volume" / "target" config lines
adds the possibility to have a create a unique "hostname:port"
identifier (preparatory for MACHINE_ID to distinguish virtual machines
on same host with different ports.)
2019-04-01 18:26:07 +02:00
bb2e9877b0
change version to 0.27.2
2019-03-26 15:08:55 +01:00
dfabd4e856
documentation: btrbk.conf.5: move info about allowed characters to top section
2019-03-26 15:08:55 +01:00
4a23568c40
documentation: btrbk.conf.5: remove unnecessary "{zwsp}" (zero width space)
2019-03-26 15:08:55 +01:00
86a930daf1
Makefile: add option to bypass compression (COMPRESS=no)
...
While on traditional UNIX the documentation (especially the man pages)
are gzip'ed, modern distros have helpers to compress it.
This patch adds an option to disable compression:
make COMPRESS=no
2019-03-26 15:08:47 +01:00
0e63843195
doc/Makefile: prefer asciidoctor (fallback to asciidoc) for man page generation
...
Changed preference for man page generation, as "asciidoc" is
discontinued and relies on python-2.7.
2019-03-25 14:37:35 +01:00
e879620195
change version to 0.27.1
2018-12-05 22:18:19 +01:00
0e6c1f9025
btrbk: fix regression: call "sudo readlink" for backend=btrfs-progs-sudo
...
It is possible that the subvolume path is not accessible by the user
calling btrbk. When resolving mount points, "readlink" is used on the
path, which also needs to be wrapped with "sudo".
2018-12-05 22:01:07 +01:00
c59488f405
change version to 0.27.0
2018-10-16 12:19:44 +02:00
56ee8acf3b
btrbk: add "-S" command line option (shortcut for --print-schedule)
2018-10-15 16:25:07 +02:00
5c434bc197
documentation: cosmetics: delete trainling whitespace
2018-10-13 13:44:04 +02:00
ad20b9a360
documentation: btrbk.1: explain root privileges and snapshot/backup terminology
2018-10-13 13:29:14 +02:00
37def3dc7e
documentation: btrbk.conf.5: adaptions for backend and ssh_user option (cosmetics)
2018-10-13 13:29:14 +02:00
f554a36978
documentation: adaptions for asciidoctor (literal blocks)
2018-10-13 13:29:14 +02:00
c2a344fed1
documentation: move installation instructions from README.md to doc/install.md
2018-10-13 13:29:08 +02:00
756e1e9449
documentation: remove broken link to gmane (received_uuid patch in kernel 4.4)
...
gmane is dead, see kernel patch:
b96b1db039 btrfs: fix resending received snapshot with parent
2018-10-11 16:03:31 +02:00
c087082543
documentation: btrbk.1.asciidoc: add notes on propagation of filter statements
2018-10-09 15:21:30 +02:00
1862bc16d3
documentation: btrbk.1.asciidoc: add note about "prune": source/target must be accessible
...
Related to: c65f937473
2018-08-27 15:50:36 +02:00
069304f3bb
btrbk: use system_list_mountinfo(), remove system_list_mounts(); rename fs_spec -> mount_source
...
Reasons for changing to `cat /proc/self/mountinfo`:
- `/proc/self/mounts` (or `/proc/mounts`) lacks extra info
(namespaces) and is not documented in kernel (deprecated?).
- findmnt(8) also uses /proc/self/mountinfo
Refs:
- https://www.kernel.org/doc/Documentation/filesystems/proc.txt
- https://bugzilla.redhat.com/show_bug.cgi?id=491924
- https://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-stable.git/commit/?id=2d4d4864ac08caff5c204a752bd004eed4f08760
2018-08-27 14:54:32 +02:00
3dc06c8067
documentation: btrbk.conf.5: clarify behavior of 'snapshot_create ondemand' when there are multiple targets
2018-07-30 03:28:18 +02:00
5b1b99c4ed
documentation: btrbk.conf.5: add explanation on hostname and caches
2018-07-12 18:26:35 +02:00
c2022a5b2f
documentation: add text for "subvolume ." configuration
2018-07-09 16:13:00 +02:00
2f95baf6f3
documentation: adaptions for asciidoctor (ifdefs, literal blocks)
...
When using asciidoctor, backend "manpage" (-b manpage) is used, while
a2x converts asciidoc to docbook (xml), then manpage.
Asciidoctor creates ugly indentation for [literal] blocks in SYNOPSIS,
use [verse] instead.
2018-06-25 20:49:24 +02:00
3e9066337a
documentation: fallback to asciidoctor if asciidoc (a2x) is not present
...
Asciidoc is EOL and only supports python2. Provide a fallback to
Asciidoctor for manpage generation.
Reference: https://github.com/digint/btrbk/pull/219
2018-06-25 20:46:00 +02:00
1d0d57ffac
documentation: btrbk.conf.5: add more text on file names and urls
2018-05-31 00:36:46 +02:00
ffba3e47c6
documentation: ssh_filter_btrbk.1.asciidoc: fixes, cleanup
...
- add add "always allowed" commands (as bullet list)
- remove deprecated "-c, --compress"
2018-05-15 00:06:53 +02:00
c65f937473
documentation: btrbk.1.asciidoc: add note about snapshot deletion for action "snapshot"
2018-04-16 12:27:54 +02:00
e9c30e91fb
documentation: btrbk.conf.5.asciidoc: enhance text on retention policy options
2018-04-05 18:00:29 +02:00
5791d72171
btrbk: add "preserve_hour_of_day" configuration option
...
Introduces the new config option "preserve_hour_of_day" to specify
after what time backups should be considered as dailies.
Based on pull request #204 , with changes:
- calculation of weekly backups
- change format of preserve_matrix
2018-04-05 16:37:31 +02:00
1fd3a547df
change version to 0.26.1; bump copyright year
2018-03-05 11:55:56 +01:00
1cf004533c
documentation: replace subvolid=0 with subvolid=5
2018-03-05 11:33:08 +01:00
8610e75459
btrbk: add archive_exclude configuration option
...
Support wildcard characters, matches against both "$sroot->{PATH}" and
"$sroot->{PATH}/$snapshot_name".
2018-02-13 22:50:23 +01:00
0ebe2ea2e1
btrbk: add "allow_multiple" flag for config_options declaration; use for option "group"
2018-02-13 19:30:24 +01:00
a835241ccf
documentation: btrbk.1.asciidoc: add note about listing all snapshots for "btrbk list snapshots"
2018-02-03 13:18:19 +01:00
308444f3ed
documentation: FAQ.md: add warning on "dd" usage for disk cloning
2018-01-20 18:05:33 +01:00
659b7de82f
doc/btrbk.conf.5.asciidoc: fix spelling
2017-10-12 17:07:05 +02:00
79cbf7c0c3
change version to 0.26.0
2017-10-12 00:39:06 +02:00
c445b32459
doc/Makefile: use a2x --no-noxmllint for man page conversion
2017-10-12 00:39:06 +02:00
780ef57895
documentation: remove experimental status of option "stream_buffer"
2017-10-11 20:54:41 +02:00
d941ecfce9
documentation: change digint links to https://
2017-10-11 20:54:41 +02:00
15dde32126
documentation: fix broken links
2017-10-11 20:54:41 +02:00
fdba94f8c7
documentation: btrbk.1.asciidoc: add action command / result matrix
2017-10-11 20:54:41 +02:00
c44c83bc33
Makefile: call doc/Makefile for installing files from "doc/" folder; use more variables
2017-10-11 20:54:41 +02:00
c26b7d3748
doc/Makefile: generate man pages from asciidoc
2017-10-11 20:54:41 +02:00
2042c6ccd9
documentation: ssh_filter_btrbk.1.asciidoc: use "ssh_filter_btrbk" (without ".sh") in name section, as this is used as the output filename for asciidoc
2017-10-11 20:54:41 +02:00
c70e9bb757
documentation: ssh_filter_btrbk.1.asciidoc: cleanup
2017-10-11 20:54:41 +02:00
0231051162
documentation: btrbk.1.asciidoc: cleanup
2017-10-11 20:54:26 +02:00
3df8984337
documentation: btrbk.conf.5.asciidoc: change options subsections; cosmetics
2017-10-11 18:54:41 +02:00
43399be0db
documentation: btrbk.conf.5.asciidoc: add short descriptions for target raw options
2017-10-11 18:05:51 +02:00
c4ced9d6e4
documentation: convert all groff files (man pages) to asciidoc
...
- btrbk.conf.5 to btrbk.conf.5.asciidoc
- btrbk.1 to btrbk.1.asciidoc
- ssh_filter_btrbk.1 to ssh_filter_btrbk.1.asciidoc
2017-10-11 18:04:25 +02:00
e9a517f161
btrbk: add options "{snapshot,target,archive}_qgroup_destroy": destroy qgroups whenever a subvolume is deleted
...
Btrfs does not destroy qgroups when subvolumes are deleted (see
https://bugzilla.kernel.org/show_bug.cgi?id=91751 ). As a workaround
for this, btrbk can be configured to always destroy the corresponding
default qgroup "0/<subvol-id>" whenever a subvolume (snapshot, backup
or archive) is deleted.
Added configuration options:
- snapshot_qgroup_destroy
- target_qgroup_destroy
- archive_qgroup_destroy
2017-10-02 16:23:23 +02:00
a5aaffa5b5
documentation: add "prune" to list of affected commands by several options
2017-10-02 13:44:35 +02:00
2e974c1f4f
btrbk: add "--wipe" command line option
2017-09-28 14:17:00 +02:00
5bdc3e527b
btrbk: add "prune" command
2017-09-28 14:17:00 +02:00
422d52c063
btrbk: add key derivation for encrypted raw targets using external backend
2017-09-28 14:17:00 +02:00
de7628ac7c
btrbk: add openssl_enc encryption for raw targets; add system_urandom()
...
Example:
Manually create a key:
# KEYFILE=/some/secure/place/btrbk.key
# dd if=/dev/urandom bs=1 count=32 | od -x -A n | tr -d "[:space:]" > $KEYFILE
btrbk.conf:
volume /mnt/btr_pool
incremental no
raw_target_encrypt openssl_enc
openssl_ciphername aes-256-cbc
openssl_iv_size 16 # NOTE: set to "no" if no IV is needed by the selected cipher
openssl_keyfile /some/secure/place/btrbk.key
subvolume home
target raw ssh://cloud.example.com/backup
2017-09-28 14:17:00 +02:00
e804930b5e
btrbk: allow deletion of non-incremental raw targets
...
implemented directly in btrfs_subvolume_delete()
2017-09-28 14:17:00 +02:00
cd8d7e3a0a
btrbk: use sidecar file "*.info" instead of encoding uuids into filename for raw targets
...
pros:
- better forward compatibility, e.g. symmetrical encryption
- better readability of files
cons:
- two files per backup
2017-09-28 14:16:53 +02:00
b8a8bc917d
documentation: FAQ.md: fix description for removing received_uuid on read-only subvolume
2017-09-11 19:37:09 +02:00
88aa8c1fea
btrbk: remove "duration" column from transaction_log/transaction_syslog
...
The "duration" column in the transaction log has proven to be
confusing to some users, especially on errors (e.g. "send-receive
ERROR 27" in issue #177 ). As it's not really necessary (duration can
be computed from the corresponding "starting" log entry), it's now
being dropped.
2017-08-28 17:55:27 +02:00
b1f3936826
ssh_filter_btrbk: bugfix: use "lzop" instead of "lzo" for lzo compression command
2017-08-21 14:42:01 +02:00
ee17c1a2b4
ssh_filter_btrbk: accept mbuffer command (stream_compress)
2017-08-21 14:39:40 +02:00
5428e9cd93
btrbk: add "resume" and "snapshot" commands; add --preserve-snapshots and --preserve-backups options; deprecate "-r, --resume-only" command line option
2017-08-21 13:23:20 +02:00
a9f1b6b24a
change version to 0.25.1
2017-07-30 16:03:58 +02:00
7b50846957
documentation: add more instructions for faulty received_uuid
2017-07-29 20:54:43 +02:00
356231bc2a
btrbk: abort if source subvolume has readonly or received_uuid flag
2017-07-29 19:03:23 +02:00
83a38cb390
documentation: FAQ.md: add section "How can I setup a debian pre-install-hook?"
2017-06-25 21:23:55 +02:00
b2cc99b0fb
btrbk: bugfix: accept "no" for "transaction_log", "transaction_syslog" and "lockfile" configuration options
2017-06-25 18:06:06 +02:00
315b3f24a1
btrbk: add config option "stream_buffer <size>". if set, pipes send stream through "mbuffer -m <size>"
2017-06-08 12:35:22 +02:00
b58817d5af
documentation: FAQ.md: improved "changing root subvolume" section
...
Fixed the default subvolume ID from 0 to 5. Added some tips.
2017-04-29 21:06:18 +02:00
7436d9432c
change version to 0.25.0
2017-03-18 16:53:07 +01:00
d31ffb8cb0
btrbk: allow trailing comments in btrbk.conf
2017-03-18 16:34:53 +01:00
28c65e4675
btrbk: add raw_target_split option, using "split" instead of "dd" to write raw files
2017-03-18 14:47:43 +01:00
690a8158ed
ssh_filter_btrbk: always allow pipes through compression commands
2017-03-18 12:19:07 +01:00
da70158c24
ssh_filter_btrbk: correctly handle --sudo option
2017-03-18 12:19:07 +01:00
3b7ede773a
btrbk: bugfix: make sure rate limiting comes after compression in cmd_pipe
2017-03-18 12:18:47 +01:00
a7f52785bd
documentation: add all accepted facility names for transaction_syslog
2017-02-18 13:16:43 +01:00
cb82bd5fa4
btrbk: add supoort for "backend btrfs-progs-sudo" option; adaptions in ssh_filter_btrbk.sh
2017-01-04 15:04:22 +01:00
2acbe4978e
documentation: cosmetics: fix spelling
2017-01-03 13:42:38 +01:00
b69e9ebf34
btrbk: show aggregate "size" and "used" for "usage" action
2016-12-11 15:36:48 +01:00
da849b37ae
change version to 0.24.0
2016-11-16 15:32:17 +01:00
ff8815b235
Documentation: btrbk.conf.5: add link to https://github.com/digint/btrfs-progs-btrbk in description of "backend" feature
2016-11-16 15:31:16 +01:00
b6defaa37f
documentation: add missing documentation of archive_preserve options
2016-08-29 19:44:17 +02:00
a8a311c8c7
btrbk: add "backend" configuration option: support for distinct binaries from btrfs-progs-btrbk
...
btrfs-progs-btrbk sources (fork of btrfs-progs) can be found at:
https://github.com/digint/btrfs-progs-btrbk
2016-08-29 18:40:42 +02:00
961f96833a
btrbk: use "dd" for raw target output, with configurable block size (raw_target_block_size)
...
We use "dd" instead of shell redirections, as it is common to have
special filesystems (like NFS, SMB, FUSE) mounted on the raw target
path. By using "dd" we make sure to write in reasonably large blocks
(default=128K), which is not always the case when using redirections
(e.g. "gpg > outfile" writes in 8K blocks).
Another approach would be to always pipe through "cat", which uses
st_blksize from fstat(2) (with a minimum of 128K) to determine the
block size.
2016-08-25 13:14:01 +02:00
deeb12c069
ssh_filter_btrbk: allow stream compression if --compress option is set.
2016-08-19 17:36:40 +02:00
9913e2785a
documentation: add stream_compress documentation, update Changelog
2016-08-19 17:36:33 +02:00
9a5e8311be
change version to 0.23.3
2016-07-14 01:41:45 +02:00
Axel Burri