Split out ghe-restore-settings command

Author: rtomayko

bin/ghe-restore

@@ -87,27 +87,12 @@ ghe-maintenance-mode-enable "$host"
 
 # Restore settings and license if performing a clean restore.
 if $clean_restore; then
-    echo "Restoring settings ..."
-    ghe-ssh "$host" -- 'ghe-import-settings' < "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" 1>&3
-
-    if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-        echo "Restoring license ..."
-        ghe-ssh "$host" -- 'ghe-import-license' < "$GHE_RESTORE_SNAPSHOT_PATH/enterprise.ghl" 1>&3
-
-        if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" ]; then
-            echo "Restoring management console password ..."
-            cat "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" |
-            ghe-ssh "$host" -- \
-                "sudo -u git dd of='$GHE_REMOTE_DATA_USER_DIR/common/manage-password' 2>&1"
-            ghe-ssh "$host" -- \
-                "sudo -u git chmod 0600 '$GHE_REMOTE_DATA_USER_DIR/common/manage-password'"
-        fi
-
-        echo "
-          sudo ghe-service-ensure-mysql &&
-          sudo ghe-service-ensure-elasticsearch
-        " | ghe-ssh "$host" -- /bin/sh 1>&3
-    fi
+    ghe-restore-settings "$host"
+
+    # Make sure mysql and elasticsearch are setup and running since this is a
+    # fresh install which hasn't had a configure run yet.
+    echo "sudo ghe-service-ensure-mysql && sudo ghe-service-ensure-elasticsearch" |
+    ghe-ssh "$host" -- /bin/sh 1>&3
 fi
 
 echo "Restoring Git repositories ..."

libexec/ghe-restore-settings

@@ -0,0 +1,46 @@
+#!/bin/sh
+#/ Usage: ghe-restore-settings <host>
+#/ Restore settings from a snapshot to the given <host>.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/..
+. libexec/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+host="$1"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Path to snapshot dir we're restoring from
+GHE_RESTORE_SNAPSHOT_PATH="$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
+
+echo "Restoring settings ..."
+ghe-ssh "$host" -- 'ghe-import-settings' < "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" 1>&3
+
+# Bail out if we're restoring against a pre-2.x appliance. Everything below is
+# supported by v2.0 appliances only.
+if [ "$GHE_VERSION_MAJOR" -lt 2 ]; then
+    exit 0
+fi
+
+echo "Restoring license ..."
+ghe-ssh "$host" -- 'ghe-import-license' < "$GHE_RESTORE_SNAPSHOT_PATH/enterprise.ghl" 1>&3
+
+# Restore management console password hash if present.
+if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" ]; then
+    echo "Restoring management console password ..."
+    cat "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" |
+    ghe-ssh "$host" -- \
+        "sudo -u git dd of='$GHE_REMOTE_DATA_USER_DIR/common/manage-password' 2>&1"
+    ghe-ssh "$host" -- \
+        "sudo -u git chmod 0600 '$GHE_REMOTE_DATA_USER_DIR/common/manage-password'"
+fi