From bb3e7661c615ec6baed5600597a7ae56f719cec9 Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Mon, 30 Mar 2020 17:02:26 +0200 Subject: [PATCH 1/2] FIX: Only bind on IPv4 loopback interface --- Resources/Private/Template/CopyElastic.sh.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Private/Template/CopyElastic.sh.template b/Resources/Private/Template/CopyElastic.sh.template index 3988c8f..afce235 100644 --- a/Resources/Private/Template/CopyElastic.sh.template +++ b/Resources/Private/Template/CopyElastic.sh.template @@ -1,7 +1,7 @@ #!/usr/bin/env bash export NODE_TLS_REJECT_UNAUTHORIZED=0 -ssh {remoteInstance.sshOptions->f:format.raw()} -C -f -N -L 9210:{remoteConfiguration.elasticsearchHost}:{remoteConfiguration.elasticsearchPort} {remoteInstance.user}@{remoteInstance.host} +ssh {remoteInstance.sshOptions->f:format.raw()} -C -f -N -L 127.0.0.1:9210:{remoteConfiguration.elasticsearchHost}:{remoteConfiguration.elasticsearchPort} {remoteInstance.user}@{remoteInstance.host} sshpid=$? trap "kill $sshpid" SIGTERM SIGINT From 1ba8e9487eed95eb7be817842d5caeb4f1691cbd Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Mon, 30 Mar 2020 17:04:14 +0200 Subject: [PATCH 2/2] FIX: Always kill ssh port forwarding after script ends --- Resources/Private/Template/CopyElastic.sh.template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Resources/Private/Template/CopyElastic.sh.template b/Resources/Private/Template/CopyElastic.sh.template index afce235..dacde8f 100644 --- a/Resources/Private/Template/CopyElastic.sh.template +++ b/Resources/Private/Template/CopyElastic.sh.template @@ -3,7 +3,7 @@ export NODE_TLS_REJECT_UNAUTHORIZED=0 ssh {remoteInstance.sshOptions->f:format.raw()} -C -f -N -L 127.0.0.1:9210:{remoteConfiguration.elasticsearchHost}:{remoteConfiguration.elasticsearchPort} {remoteInstance.user}@{remoteInstance.host} sshpid=$? -trap "kill $sshpid" SIGTERM SIGINT +trap "kill $sshpid" EXIT {elasticDumpPath} \ @@ -17,5 +17,3 @@ trap "kill $sshpid" SIGTERM SIGINT --output={localConfiguration.elasticsearchScheme}://{localConfiguration.elasticsearchHost}:{localConfiguration.elasticsearchPort}/{index.local.indexName} \ --type=data - -kill $sshpid