From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5BAC36AD31 for ; Mon, 15 Mar 2021 23:02:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2B49427860 for ; Mon, 15 Mar 2021 23:02:11 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 87E0E27835 for ; Mon, 15 Mar 2021 23:02:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 53CBF463D4 for ; Mon, 15 Mar 2021 23:02:10 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 15 Mar 2021 23:01:30 +0100 Message-Id: <20210315220135.25988-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210315220135.25988-1-s.ivanov@proxmox.com> References: <20210315220135.25988-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.065 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH pmg-api 1/6] cluster: refactor rsync_command X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 22:02:11 -0000 pull out the ssh part for later reusal Signed-off-by: Stoiko Ivanov --- 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