Skip to content

Commit 71cd8f6

Browse files
Merge pull request #608 from github/ls/remove-old-code
remove rsync restore method used by GHES versions prior to 2.13
2 parents 9cd5c50 + 2a89490 commit 71cd8f6

File tree

4 files changed

+9
-135
lines changed

4 files changed

+9
-135
lines changed

bin/ghe-restore

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -274,28 +274,17 @@ commands=("
274274
echo \"Restoring Redis database ...\"
275275
ghe-ssh \"$GHE_HOSTNAME\" -- 'ghe-import-redis' < \"$GHE_RESTORE_SNAPSHOT_PATH/redis.rdb\" 1>&3")
276276

277-
# Unified and enhanced restore method to 2.13.0 and newer
278-
if $CLUSTER || [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 2.13.0)" ]; then
279-
commands+=("
280-
echo \"Restoring Git repositories ...\"
281-
ghe-restore-repositories \"$GHE_HOSTNAME\"")
282-
283-
commands+=("
284-
echo \"Restoring Gists ...\"
285-
ghe-restore-repositories-gist \"$GHE_HOSTNAME\"")
277+
commands+=("
278+
echo \"Restoring Git repositories ...\"
279+
ghe-restore-repositories \"$GHE_HOSTNAME\"")
286280

287-
commands+=("
288-
echo \"Restoring GitHub Pages artifacts ...\"
289-
ghe-restore-pages \"$GHE_HOSTNAME\" 1>&3")
290-
else
291-
commands+=("
292-
echo \"Restoring Git repositories and Gists ...\"
293-
ghe-restore-repositories-rsync \"$GHE_HOSTNAME\" 1>&3")
281+
commands+=("
282+
echo \"Restoring Gists ...\"
283+
ghe-restore-repositories-gist \"$GHE_HOSTNAME\"")
294284

295-
commands+=("
296-
echo \"Restoring GitHub Pages ...\"
297-
ghe-restore-pages-rsync \"$GHE_HOSTNAME\" 1>&3")
298-
fi
285+
commands+=("
286+
echo \"Restoring GitHub Pages artifacts ...\"
287+
ghe-restore-pages \"$GHE_HOSTNAME\" 1>&3")
299288

300289
commands+=("
301290
echo \"Restoring SSH authorized keys ...\"

share/github-backup-utils/ghe-restore-pages-rsync

Lines changed: 0 additions & 21 deletions
This file was deleted.

share/github-backup-utils/ghe-restore-repositories-rsync

Lines changed: 0 additions & 47 deletions
This file was deleted.

share/github-backup-utils/ghe-restore-userdata

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)