Merge pull request #426 from github/lildude/rsync-for-pages-pre-213

Use old rsync restore method for pages prior to 2.13

Author: lildude

bin/ghe-restore

@@ -275,13 +275,17 @@ if $CLUSTER || [ "$(version $GHE_REMOTE_VERSION)" -ge "$(version 2.13.0)" ]; the
 
   echo "Restoring Gists ..."
   ghe-restore-repositories-gist "$GHE_HOSTNAME"
+
+  echo "Restoring GitHub Pages ..."
+  ghe-restore-pages "$GHE_HOSTNAME" 1>&3
 else
   echo "Restoring Git repositories and Gists ..."
   ghe-restore-repositories-rsync "$GHE_HOSTNAME" 1>&3
+
+  echo "Restoring GitHub Pages ..."
+  ghe-restore-pages-rsync "$GHE_HOSTNAME" 1>&3
 fi
 
-echo "Restoring GitHub Pages ..."
-ghe-restore-pages "$GHE_HOSTNAME" 1>&3
 
 echo "Restoring SSH authorized keys ..."
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/authorized-keys.json" 1>&3

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

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-pages-rsync <host>
+#/ Restore an rsync snapshot of all Pages data to a GitHub instance.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when the rsync strategy is used.
+set -e
+
+# Bring in the backup configuration
+# shellcheck source=share/github-backup-utils/ghe-backup-config
+. "$( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config"
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+bm_start "$(basename $0)"
+
+# Restore all pages data via rsync
+ghe-restore-userdata pages "$1"
+
+bm_end "$(basename $0)"