Merge pull request #39 from github/merge-public-master

Merge public master

Author: mutle

bin/ghe-backup

@@ -121,6 +121,9 @@ if [ "$GHE_BACKUP_STRATEGY" = "tarball" ]; then
     GHE_MAINTENANCE_MODE_ENABLED=true
 fi
 
+ghe-backup-store-version  ||
+echo "Warning: storing backup-utils version remotely failed."
+
 echo "Backing up GitHub settings ..."
 ghe-backup-settings ||
 failures="$failures settings"

bin/ghe-host-check

@@ -37,7 +37,7 @@ set -e
 if [ $rc -ne 0 ]; then
     case $rc in
         255)
-            if echo "$output" | grep -i "port 22: connection refused\|port 22: no route to host\|Connection timed out during banner exchange" >/dev/null; then
+            if echo "$output" | grep -i "port 22: connection refused\|port 22: no route to host\|ssh_exchange_identification: Connection closed by remote host\|Connection timed out during banner exchange" >/dev/null; then
                 exec "bin/$(basename $0)" "$hostname:122"
             fi
 

bin/ghe-restore

@@ -187,6 +187,9 @@ if $instance_configured; then
     fi
 fi
 
+ghe-backup-store-version  ||
+echo "Warning: storing backup-utils version remotely failed."
+
 # Restore settings and license if restoring to an unconfigured appliance or when
 # specified manually.
 if $restore_settings; then

share/github-backup-utils/ghe-backup-store-version

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-backup-store-version
+#/ Stores information about the used version of backup-utils on <host>
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+if [ -d .git ]; then
+  version_info="$BACKUP_UTILS_VERSION"
+  ref=$(git rev-parse HEAD || true)
+  if [ -n "$ref" ]; then
+    version_info="$version_info:$ref"
+  fi
+  echo "$version_info" |
+  ghe-ssh "$GHE_HOSTNAME" -- "sudo dd of=$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
+fi

test/test-ghe-backup.sh

@@ -131,6 +131,9 @@ begin_test "ghe-backup first snapshot"
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi
+
+    # verify that ghe-backup wrote its version information to the host
+    [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
 )
 end_test
 

test/test-ghe-restore.sh

@@ -497,7 +497,7 @@ begin_test "cluster: ghe-restore from v2.5.0 snapshot"
     export GHE_RESTORE_HOST
 
     # create file used to determine if instance is in maintenance mode.
-    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system" "$GHE_REMOTE_DATA_USER_DIR/common"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
     echo "v2.5.0" > "$GHE_DATA_DIR/current/version"
@@ -508,5 +508,8 @@ begin_test "cluster: ghe-restore from v2.5.0 snapshot"
         : ghe-restore should have exited successfully
         false
     fi
+
+    # verify that ghe-backup wrote its version information to the host
+    [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
 )
 end_test