ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: added "ssh_compression" configuration option for setting the SSH compression flag

pull/48/head
Jan Wagner 2015-09-01 00:43:14 +02:00 committed by Axel Burri
parent 79f52924b6
commit 68876f0562
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,6 +1,7 @@
btrbk-current
* Added configuration option "ssh_port" (close: #39).
* Added configuration option "ssh_compression" (close: #44).
* Added command line option "--progress" (close: #42).
btrbk-0.19.3

11
btrbk
View File

@ -76,6 +76,7 @@ my %config_options = (
ssh_identity => { default => undef, accept_file => { absolute => 1 } },
ssh_user => { default => "root", accept_regexp => qr/^[a-z_][a-z0-9_-]*$/ },
ssh_port => { default => "default", accept => [ "default" ], accept_numeric => 1 },
ssh_compression => { default => undef, accept => [ "yes", "no" ] },
btrfs_progs_compat => { default => undef, accept => [ "yes", "no" ] },
# deprecated options
@ -230,12 +231,14 @@ sub vinfo($$)
);
if($url =~ /^ssh:\/\/(\S+?)(\/\S+)$/) {
my ($host, $path) = ($1, $2);
my $ssh_port = config_key($config, "ssh_port");
my $ssh_user = config_key($config, "ssh_user");
my $ssh_identity = config_key($config, "ssh_identity");
my ($host, $path) = ($1, $2);
my $ssh_port = config_key($config, "ssh_port");
my $ssh_user = config_key($config, "ssh_user");
my $ssh_identity = config_key($config, "ssh_identity");
my $ssh_compression = config_key($config, "ssh_compression");
my @ssh_options;
push(@ssh_options, '-p', $ssh_port) if($ssh_port ne "default");
push(@ssh_options, '-C') if($ssh_compression);
if($ssh_identity) {
push(@ssh_options, '-i', $ssh_identity);
} else {

1
btrbk.conf.example
View File

@ -52,6 +52,7 @@ snapshot_dir _btrbk_snap
#ssh_identity /etc/btrbk/ssh/id_ed25519
#ssh_user root
#ssh_port default
#ssh_compression no
# Don't wait for transaction commit on deletion. Set this to "after"
# or "each" to make sure the deletion of subvolumes is committed to

4
doc/btrbk.conf.5
View File

@ -120,6 +120,10 @@ have to make sure that the remote user is able to run /sbin/btrfs
Port to connect to on the remote host. Defaults to \[lq]default\[rq]
(the port specified in \fIssh_config\fR, which defaults to 22).
.TP
\fBssh_compression\fR yes|no
Enables or disables the compression of ssh connections. Defaults to
\[lq]no\[rq].
.TP
\fBbtrfs_commit_delete\fR after|each|no
If set, make sure the deletion of snapshot and backup subvolumes are
committed to disk when btrbk terminates. Defaults to \[lq]no\[rq].