From c1f6743940250b04ae6dbea30d8805571add39b6 Mon Sep 17 00:00:00 2001 From: Joseph McDonald Date: Mon, 1 Jun 2015 15:00:39 -0700 Subject: [PATCH 1/3] ceph-post-file: behave when sftp doesn't take -i Fixes: #11836 Signed-off-by: Joseph McDonald (cherry picked from commit b84031ed5eaace1222e14d3c4076a3ab1155da96) --- src/ceph-post-file.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph-post-file.in b/src/ceph-post-file.in index 9b922a6c94153..fed1666ae8fab 100755 --- a/src/ceph-post-file.in +++ b/src/ceph-post-file.in @@ -155,7 +155,7 @@ done cp "$ssh_key" "$t4" cp "${ssh_key}.pub" "$t4.pub" -sftp -i $t4 \ +sftp -o "IdentityFile=$t4" \ -C \ -oCheckHostIP=no \ -oGlobalKnownHostsFile=$known_hosts \ From 3e65a10bd2351744da199a4b076659191b4378a2 Mon Sep 17 00:00:00 2001 From: Joseph McDonald Date: Mon, 1 Jun 2015 15:05:32 -0700 Subject: [PATCH 2/3] ceph-post-file: improve check for a source install Signed-off-by: Joseph McDonald (cherry picked from commit ee170eadcdcb4b54d36a7d474558484de9d917eb) --- src/ceph-post-file.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ceph-post-file.in b/src/ceph-post-file.in index fed1666ae8fab..b278e8abd95c7 100755 --- a/src/ceph-post-file.in +++ b/src/ceph-post-file.in @@ -1,16 +1,16 @@ #!/bin/bash -e -# if we start up as ./$0, assume we are running from a source -# checkout. -if [ `dirname $0` = "." ] && [ $PWD != "/usr/bin" ]; then - known_hosts=../share/known_hosts_drop.ceph.com - ssh_key=../share/id_dsa_drop.ceph.com -else - known_hosts=@datadir@/known_hosts_drop.ceph.com - ssh_key=@datadir@/id_dsa_drop.ceph.com +# If these files exist, assume we are a source install. +if [[ -f ../share/known_hosts_drop.ceph.com && -f ../share/id_dsa_drop.ceph.com ]] + then # running from source install + known_hosts=../share/known_hosts_drop.ceph.com + ssh_key=../share/id_dsa_drop.ceph.com + else # running from a pkg install + known_hosts=@datadir@/known_hosts_drop.ceph.com + ssh_key=@datadir@/id_dsa_drop.ceph.com fi -usage() { +function usage() { echo "Usage: $0 [options] file1 [dir2 ...] Easily upload files or directories to ceph.com for analysis by Ceph From 22f58ce2665f1ea6b38f6016dc585202a4595322 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 1 Jun 2015 15:10:14 -0700 Subject: [PATCH 3/3] Makefile: install ceph-post-file keys with mode 600 Otherwise ssh (may) prompt for a password. Signed-off-by: Sage Weil (cherry picked from commit 106a1c3081d02446aa3d8e13865da0c3393bae90) --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 73817e5c76f97..527dd22d0d7ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,9 @@ EXTRA_DIST += \ # why is it so hard to make autotools to this? install-data-local: -mkdir -p $(DESTDIR)$(datadir)/ceph - -install -m 644 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com - -install -m 644 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com - -install -m 644 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub + -install -m 600 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com + -install -m 600 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com + -install -m 600 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub all-local: if WITH_DEBUG