Merge pull request #516 from github/taz/fix-exclude-file-removal

taz · web-flow · commit 17a846e83d5a · 2019-10-03T18:55:11.000+10:00
Remove temporary exclude file from the backup host not the target GHES appliance
diff --git a/share/github-backup-utils/ghe-backup-es-rsync b/share/github-backup-utils/ghe-backup-es-rsync
@@ -67,7 +67,7 @@ cleanup () {
   ghe_verbose "* Enabling ES index flushing ..."
   echo '{"index":{"translog.disable_flush":false}}' |
   ghe-ssh "$host" -- curl -s -XPUT "localhost:9200/_settings" -d @- >/dev/null
-  ghe-ssh "$host" rm -rf "$exclude_file"
+  rm -rf "$exclude_file"
 }
 trap 'cleanup' EXIT
 trap 'exit $?' INT # ^C always terminate

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ cleanup () {`
`67`	`67`	`ghe_verbose "* Enabling ES index flushing ..."`
`68`	`68`	`echo '{"index":{"translog.disable_flush":false}}' \|`
`69`	`69`	`ghe-ssh "$host" -- curl -s -XPUT "localhost:9200/_settings" -d @- >/dev/null`
`70`		`- ghe-ssh "$host" rm -rf "$exclude_file"`
	`70`	`+ rm -rf "$exclude_file"`
`71`	`71`	`}`
`72`	`72`	`trap 'cleanup' EXIT`
`73`	`73`	`trap 'exit $?' INT # ^C always terminate`