From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 1/6] cluster: refactor rsync_command
Date: Mon, 15 Mar 2021 23:01:30 +0100 [thread overview]
Message-ID: <20210315220135.25988-2-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20210315220135.25988-1-s.ivanov@proxmox.com>
pull out the ssh part for later reusal
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PMG/Cluster.pm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/PMG/Cluster.pm b/src/PMG/Cluster.pm
index 6bb940a..daaa439 100644
--- a/src/PMG/Cluster.pm
+++ b/src/PMG/Cluster.pm
@@ -280,13 +280,21 @@ my $cond_commit_synced_file = sub {
return 1;
};
+my $ssh_command = sub {
+ my ($host_key_alias, @args) = @_;
+
+ my $cmd = ['ssh', '-l', 'root', '-o', 'BatchMode=yes'];
+ push @$cmd, '-o', "HostKeyAlias=${host_key_alias}" if $host_key_alias;
+ push @$cmd, @args if @args;
+ return $cmd;
+};
+
my $rsync_command = sub {
my ($host_key_alias, @args) = @_;
- my $ssh_cmd = '--rsh=ssh -l root -o BatchMode=yes';
- $ssh_cmd .= " -o HostKeyAlias=${host_key_alias}" if $host_key_alias;
+ my $ssh_cmd = join(' ', @{$ssh_command->($host_key_alias)});
- my $cmd = ['rsync', $ssh_cmd, '-q', @args];
+ my $cmd = ['rsync', "--rsh=$ssh_cmd", '-q', @args];
return $cmd;
};
--
2.20.1
next prev parent reply other threads:[~2021-03-15 22:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 22:01 [pmg-devel] [PATCH pmg-api 0/6] add mechanism to update certificate fingerprints in cluster Stoiko Ivanov
2021-03-15 22:01 ` Stoiko Ivanov [this message]
2021-03-15 22:01 ` [pmg-devel] [PATCH pmg-api 2/6] cluster: add helper to get remote cert fingerprint Stoiko Ivanov
2021-03-15 22:01 ` [pmg-devel] [PATCH pmg-api 3/6] api: cluster: add update-fingerprints call Stoiko Ivanov
2021-03-15 22:01 ` [pmg-devel] [PATCH pmg-api 4/6] cluster: add trigger_update_fingerprints Stoiko Ivanov
2021-03-15 22:01 ` [pmg-devel] [PATCH pmg-api 5/6] pmgcm: add trigger-update-fingerprint Stoiko Ivanov
2021-03-15 22:01 ` [pmg-devel] [PATCH pmg-api 6/6] api: certificates: trigger fingerprint update Stoiko Ivanov
2021-03-16 18:18 ` [pmg-devel] applied-series: [PATCH pmg-api 0/6] add mechanism to update certificate fingerprints in cluster Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210315220135.25988-2-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox