use POSIX qw(strftime ENOENT);
use PVE::JSONSchema qw(get_standard_option);
-use PVE::Tools qw(run_command file_set_contents file_get_contents file_read_firstline);
+use PVE::Tools qw(run_command file_set_contents file_get_contents file_read_firstline $IPV6RE);
+
+# returns a repository string suitable for proxmox-backup-client, pbs-restore, etc.
+# $scfg must have the following structure:
+# {
+# datastore
+# server
+# port (optional defaults to 8007)
+# username (optional defaults to 'root@pam')
+# }
+sub get_repository {
+ my ($scfg) = @_;
+
+ my $server = $scfg->{server};
+ die "no server given\n" if !defined($server);
+
+ $server = "[$server]" if $server =~ /^$IPV6RE$/;
+
+ if (my $port = $scfg->{port}) {
+ $server .= ":$port" if $port != 8007;
+ }
+
+ my $datastore = $scfg->{datastore};
+ die "no datastore given\n" if !defined($datastore);
+
+ my $username = $scfg->{username} // 'root@pam';
+
+ return "$username\@$server:$datastore";
+}
sub new {
my ($class, $scfg, $storeid, $sdir) = @_;
if ! -x $client_exe;
my $scfg = $self->{scfg};
- my $server = $scfg->{server};
- my $datastore = $scfg->{datastore};
- my $username = $scfg->{username} // 'root@pam';
+ my $repo = get_repository($scfg);
my $userns_cmd = delete $opts{userns_cmd};
push @$cmd, @$param if defined($param);
- push @$cmd, "--repository", "$username\@$server:$datastore";
+ push @$cmd, "--repository", $repo;
local $ENV{PBS_PASSWORD} = $self->get_password();
return file_get_contents($encfile);
};
+# lists all snapshots, optionally limited to a specific group
sub get_snapshots {
- my ($self, $opts) = @_;
+ my ($self, $group) = @_;
my $param = [];
- push @$param, $opts->{group} if defined($opts->{group});
+ push @$param, $group if defined($group);
return run_client_cmd($self, "snapshots", $param);
};
-sub backup_tree {
- my ($self, $opts) = @_;
+# create a new PXAR backup of a FS directory tree - doesn't cross FS boundary
+# by default.
+sub backup_fs_tree {
+ my ($self, $root, $id, $pxarname, $cmd_opts) = @_;
- my $type = delete $opts->{type};
- die "backup-type not provided\n" if !defined($type);
- my $id = delete $opts->{id};
die "backup-id not provided\n" if !defined($id);
- my $root = delete $opts->{root};
- die "root dir not provided\n" if !defined($root);
- my $pxarname = delete $opts->{pxarname};
+ die "backup root dir not provided\n" if !defined($root);
die "archive name not provided\n" if !defined($pxarname);
- my $time = delete $opts->{time};
my $param = [
"$pxarname.pxar:$root",
- '--backup-type', $type,
+ '--backup-type', 'host',
'--backup-id', $id,
];
- push @$param, '--backup-time', $time if defined($time);
- return run_raw_client_cmd($self, 'backup', $param, %$opts);
+ $cmd_opts //= {};
+
+ return run_raw_client_cmd($self, 'backup', $param, %$cmd_opts);
};
sub restore_pxar {