From acda77a9bc6390be49a367e5f1199a71b9ac375a Mon Sep 17 00:00:00 2001
From: Twan Wolthof <twan@xeago.nl>
Date: Sat, 18 Oct 2014 18:35:00 +0200
Subject: [PATCH 001/288] Add .travis.yml

Runs debuild -uc -us.
Unfortunately runs the tests twice due to the default target also
running the tests
---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..82488dcf2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,6 @@
+---
+script:
+  - debuild -uc -us
+before_install: 
+  - sudo apt-get update -qq
+  - sudo apt-get install -y devscripts

From c8a998d7360f52c4c8757eccf941803be8fb387d Mon Sep 17 00:00:00 2001
From: Twan Wolthof <twan@xeago.nl>
Date: Thu, 6 Nov 2014 02:27:20 +0100
Subject: [PATCH 002/288] override_dh_auto_build to prevent from running tests
 when 'building'

---
 debian/rules | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/rules b/debian/rules
index 4915d7afb..290fed548 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 build-indep:
 
+override_dh_auto_build:
+
 %:
 	dh $@

From 3a3a1270f590e161218b19a846edf1026b2a16a0 Mon Sep 17 00:00:00 2001
From: Andy Walker <andy@fbsdata.com>
Date: Thu, 13 Nov 2014 11:15:49 -0600
Subject: [PATCH 003/288] Enable SSH BatchMode

---
 share/github-backup-utils/ghe-ssh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 6a066e9a4..1ecab00a0 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -61,4 +61,4 @@ fi
 $GHE_VERBOSE_SSH && set -x
 
 # Exec ssh command with modified host / port args and add nice to command.
-exec ssh $opts "$host" -- $GHE_NICE $GHE_IONICE "$@"
+exec ssh $opts -o 'BatchMode yes' "$host" -- $GHE_NICE $GHE_IONICE "$@"

From 263ebf29acf7e59ccb3358dd804326f0c3a78c74 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 13 Nov 2014 09:30:15 -0800
Subject: [PATCH 004/288] Tighten git-gc and git-nw-repack patterns to avoid
 false positives

---
 share/github-backup-utils/ghe-backup-repositories-rsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 9c2a98310..062983fb9 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -76,7 +76,7 @@ echo "
     while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
         # note: the bracket synta[x] below is to prevent matches against the
         # grep process itself.
-        if ps axo pid,args | grep -q -e 'git.*nw-repac[k]' -e 'git.*g[c]'; then
+        if ps axo pid,args | grep -q -e 'git[ -].*nw-repac[k]' -e 'git[ -].*g[c]'; then
             sleep 1
             sanity=\$(( sanity + 1 ))
         else

From d3d3d8c4560b20a639d6079180a23f0108d65159 Mon Sep 17 00:00:00 2001
From: Andy Walker <andy@fbsdata.com>
Date: Fri, 14 Nov 2014 11:02:50 -0600
Subject: [PATCH 005/288] Override BatchMode in ghe-host-check

---
 bin/ghe-host-check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index faf5317fa..17012a397 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -24,7 +24,7 @@ port=$(ssh_port_part "$host")
 hostname=$(ssh_host_part "$host")
 
 set +e
-output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh $options $host -- /bin/sh 2>&1)
+output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o 'BatchMode no' $options $host -- /bin/sh)
 rc=$?
 set -e
 

From 214fd4e4576d5aec4a6ee4a740765a1d34249ce6 Mon Sep 17 00:00:00 2001
From: Andy Walker <andy@fbsdata.com>
Date: Fri, 14 Nov 2014 11:03:21 -0600
Subject: [PATCH 006/288] Turn ssh opts into array. Helps with quoted args

---
 share/github-backup-utils/ghe-ssh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 1ecab00a0..aed686d97 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -10,11 +10,11 @@ set -e
 cd $(dirname "$0")/../..
 . share/github-backup-utils/ghe-backup-config
 
-opts=$GHE_EXTRA_SSH_OPTS
+eval opts=($GHE_EXTRA_SSH_OPTS)
 while true; do
     case "$1" in
         -p|-l|-o)
-            opts="$opts $1 $2"
+            opts=("${opts[@]}" $1 "$2")
             shift 2
             ;;
         --)
@@ -42,12 +42,12 @@ port=$(ssh_port_part "$host")
 host=$(ssh_host_part "$host")
 
 # Add port / -p option when non-standard port given.
-[ "$port" != "22" ] && opts="-p $port $opts"
+[ "$port" != "22" ] && opts=(-p $port "${opts[@]}")
 
 # Add user / -l option
 user="${host%@*}"
 [ "$user" = "$host" ] && user="admin"
-opts="-l $user $opts"
+opts=(-l "$user" "${opts[@]}")
 
 # Bail out with error if the simple command form is used with complex commands.
 # Complex
@@ -61,4 +61,4 @@ fi
 $GHE_VERBOSE_SSH && set -x
 
 # Exec ssh command with modified host / port args and add nice to command.
-exec ssh $opts -o 'BatchMode yes' "$host" -- $GHE_NICE $GHE_IONICE "$@"
+exec ssh "${opts[@]}" -o 'BatchMode yes' "$host" -- $GHE_NICE $GHE_IONICE "$@"

From a1ca969127a28b6df5aa3c3664846b1c252f4b9a Mon Sep 17 00:00:00 2001
From: Andy Walker <andy@fbsdata.com>
Date: Fri, 14 Nov 2014 11:11:05 -0600
Subject: [PATCH 007/288] Replace accidentallied redirection

---
 bin/ghe-host-check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 17012a397..9ccfd09fa 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -24,7 +24,7 @@ port=$(ssh_port_part "$host")
 hostname=$(ssh_host_part "$host")
 
 set +e
-output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o 'BatchMode no' $options $host -- /bin/sh)
+output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o 'BatchMode no' $options $host -- /bin/sh 2>&1)
 rc=$?
 set -e
 

From fa683114460602cafab0925f90f12e3190d24bb2 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Fri, 14 Nov 2014 13:40:12 -0800
Subject: [PATCH 008/288] Anchor git-gc proc matches to start of line, further
 tightening

Additional enhancements to reduce the likelihood of false positive
matches causing backups to fail after the GC cooldown window is
exceeded.

These should be much more resilient to matching either "gc" or
"nw-repack" in other commands. The changes here introduce the
following new rules for matching gc / repack processes::w

 - Only match "git" at the beginning of the line. Verified all
   GC / nw-repack invocations follow this pattern.
 - Match either "git gc" or "git --opts ... gc" but require a space
   before the subcommand (gc / nw-repack) in either case. i.e. Don't
   match "git somethingc".
 - Match "git ... gc" where "gc" is anchored at end of line.
 - Match "git gc --opts" where gc is followed by a space.
---
 share/github-backup-utils/ghe-backup-repositories-rsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 062983fb9..1f4a1a4ec 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -76,7 +76,7 @@ echo "
     while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
         # note: the bracket synta[x] below is to prevent matches against the
         # grep process itself.
-        if ps axo pid,args | grep -q -e 'git[ -].*nw-repac[k]' -e 'git[ -].*g[c]'; then
+        if ps axo args | grep -q -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)'; then
             sleep 1
             sanity=\$(( sanity + 1 ))
         else

From 63990dec56d95db1a5c155ca0d84824713902bcb Mon Sep 17 00:00:00 2001
From: Twan Wolthof <twan@xeago.nl>
Date: Thu, 6 Nov 2014 01:11:32 +0100
Subject: [PATCH 009/288] Source /etc/github-backup-utils/backup.config if it
 exists

---
 share/github-backup-utils/ghe-backup-config | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 0b78d3a8f..1832090c6 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -20,6 +20,9 @@ PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 
 # The backup config file. This may be set in the environment.
 : ${GHE_BACKUP_CONFIG:="$GHE_BACKUP_ROOT/backup.config"}
+if [ ! -f $GHE_BACKUP_CONFIG ]; then
+    GHE_BACKUP_CONFIG="/etc/github-backup-utils/backup.config"
+fi
 
 # Parse out -v (verbose) argument
 if [ "$1" = "-v" ]; then
@@ -38,7 +41,9 @@ fi
 
 # Check that the config file exists before we source it in.
 if [ ! -f "$GHE_BACKUP_CONFIG" ]; then
-    echo "Error: The backup config file ('$GHE_BACKUP_CONFIG') doesn't exist." 1>&2
+    echo "Error: No backup configuration file found. Tried:"
+    echo " - $GHE_BACKUP_ROOT/backup.config"
+    echo " - /etc/github-backup-utils/backup.config"
     exit 2
 fi
 

From 93cfc1d10b495518b9cff7c30089260d18e14932 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 17 Nov 2014 08:09:15 -0800
Subject: [PATCH 010/288] Move backup.config file finding around a bit

---
 share/github-backup-utils/ghe-backup-config | 32 ++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 1832090c6..6bc0fba13 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -20,9 +20,6 @@ PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 
 # The backup config file. This may be set in the environment.
 : ${GHE_BACKUP_CONFIG:="$GHE_BACKUP_ROOT/backup.config"}
-if [ ! -f $GHE_BACKUP_CONFIG ]; then
-    GHE_BACKUP_CONFIG="/etc/github-backup-utils/backup.config"
-fi
 
 # Parse out -v (verbose) argument
 if [ "$1" = "-v" ]; then
@@ -39,20 +36,29 @@ else
     exec 3>/dev/null
 fi
 
-# Check that the config file exists before we source it in.
-if [ ! -f "$GHE_BACKUP_CONFIG" ]; then
-    echo "Error: No backup configuration file found. Tried:"
-    echo " - $GHE_BACKUP_ROOT/backup.config"
-    echo " - /etc/github-backup-utils/backup.config"
-    exit 2
-fi
-
 # Save off GHE_HOSTNAME from the environment since we want it to override the
 # backup.config value when set.
 GHE_HOSTNAME_PRESERVE="$GHE_HOSTNAME"
 
-# Source in the backup config file.
-. "$GHE_BACKUP_CONFIG"
+# Source in the backup config file from the local working copy location first
+# and then falling back to the system location.
+config_found=false
+for f in "$GHE_BACKUP_CONFIG" "/etc/github-backup-utils/backup.config"; do
+    if [ -f "$f" ]; then
+        GHE_BACKUP_CONFIG="$f"
+        . "$GHE_BACKUP_CONFIG"
+        config_found=true
+        break
+    fi
+done
+
+# Check that the config file exists before we source it in.
+if ! $config_found; then
+    echo "Error: No backup configuration file found. Tried:" 1>&2
+    echo " - $GHE_BACKUP_CONFIG" 1>&2
+    echo " - /etc/github-backup-utils/backup.config" 1>&2
+    exit 2
+fi
 
 # Restore saved of hostname.
 [ -n "$GHE_HOSTNAME_PRESERVE" ] && GHE_HOSTNAME="$GHE_HOSTNAME_PRESERVE"

From 377dab5ca616541a7b4d254c6a0ad9f472d7fd1d Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 17 Nov 2014 08:10:45 -0800
Subject: [PATCH 011/288] Typo

---
 share/github-backup-utils/ghe-backup-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 6bc0fba13..4b9df7f6a 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -60,7 +60,7 @@ if ! $config_found; then
     exit 2
 fi
 
-# Restore saved of hostname.
+# Restore saved off hostname.
 [ -n "$GHE_HOSTNAME_PRESERVE" ] && GHE_HOSTNAME="$GHE_HOSTNAME_PRESERVE"
 
 # Check that the GHE hostname is set.

From 959b6241d8fad329244f75b94a7b83a70d1c2f00 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 17 Nov 2014 08:22:48 -0800
Subject: [PATCH 012/288] Use -o Opt=val syntax instead of -o 'Opt val'

This just lets us not deal with quoted values here just yet.
---
 bin/ghe-host-check                | 2 +-
 share/github-backup-utils/ghe-ssh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 9ccfd09fa..51a7d7232 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -24,7 +24,7 @@ port=$(ssh_port_part "$host")
 hostname=$(ssh_host_part "$host")
 
 set +e
-output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o 'BatchMode no' $options $host -- /bin/sh 2>&1)
+output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
 rc=$?
 set -e
 
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index aed686d97..c7bef198a 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -61,4 +61,4 @@ fi
 $GHE_VERBOSE_SSH && set -x
 
 # Exec ssh command with modified host / port args and add nice to command.
-exec ssh "${opts[@]}" -o 'BatchMode yes' "$host" -- $GHE_NICE $GHE_IONICE "$@"
+exec ssh "${opts[@]}" -o BatchMode=yes "$host" -- $GHE_NICE $GHE_IONICE "$@"

From 46ee8af57a5de36812183fabc4866f1e7da87edb Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 17 Nov 2014 08:29:18 -0800
Subject: [PATCH 013/288] Flip back to non-bash-array option building for now

I'd like to bring this back at some point because it does make
things a lot more complete but I want to get some guidelines for
using bash features in place before switching shebangs.
---
 share/github-backup-utils/ghe-ssh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index c7bef198a..270db5cc8 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -10,11 +10,11 @@ set -e
 cd $(dirname "$0")/../..
 . share/github-backup-utils/ghe-backup-config
 
-eval opts=($GHE_EXTRA_SSH_OPTS)
+opts="$GHE_EXTRA_SSH_OPTS"
 while true; do
     case "$1" in
         -p|-l|-o)
-            opts=("${opts[@]}" $1 "$2")
+            opts="$opts $1 $2"
             shift 2
             ;;
         --)
@@ -42,12 +42,12 @@ port=$(ssh_port_part "$host")
 host=$(ssh_host_part "$host")
 
 # Add port / -p option when non-standard port given.
-[ "$port" != "22" ] && opts=(-p $port "${opts[@]}")
+[ "$port" != "22" ] && opts="-p $port $opts"
 
 # Add user / -l option
 user="${host%@*}"
 [ "$user" = "$host" ] && user="admin"
-opts=(-l "$user" "${opts[@]}")
+opts="-l $user $opts"
 
 # Bail out with error if the simple command form is used with complex commands.
 # Complex
@@ -61,4 +61,4 @@ fi
 $GHE_VERBOSE_SSH && set -x
 
 # Exec ssh command with modified host / port args and add nice to command.
-exec ssh "${opts[@]}" -o BatchMode=yes "$host" -- $GHE_NICE $GHE_IONICE "$@"
+exec ssh $opts -o BatchMode=yes "$host" -- $GHE_NICE $GHE_IONICE "$@"

From 53e493a924eee3e335825a6c9624619e1a9dd40e Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 17 Nov 2014 21:46:41 -0800
Subject: [PATCH 014/288] Update debian/changelog for v2.0 release

---
 debian/changelog | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 394ae6c49..630cffbdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+github-backup-utils (2.0.0) UNRELEASED; urgency=medium
+
+  * Support for GitHub Enterprise 2.0.
+  * Support for migrating from GitHub Enterprise 11.10.34x to 2.0 (including from
+    VMware to AWS).
+  * ghe-backup retains hardlinks present on VM in backup snapshots, saving space.
+  * ghe-restore retains hardlinks present in backup snapshot when restoring to VM.
+  * backup-utils now includes debian packaging support.
+  * Fixes an issue with ghe-restore -s not using the snapshot specified.
+  * Fixes an issue with ghe-backup not waiting for nw-repack processes to finish
+    in some instances.
+
+ -- Ryan Tomayko <ryan@github.com>  Mon, 10 Nov 2014 10:48:36 +0000
+
 github-backup-utils (1.1.0) UNRELEASED; urgency=medium
 
   * Updated documentation on minimum GitHub Enterprise version requirements for

From e8b9111c4d11fa407b4ae589f2daa7a00e31a916 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 17 Nov 2014 21:49:07 -0800
Subject: [PATCH 015/288] Update debian/changelog for v2.0.1 release

---
 debian/changelog | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 630cffbdd..ded922013 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+github-backup-utils (2.0.1) UNRELEASED; urgency=medium
+
+  * Adds /etc/github-backup-utils/backup.config as a default config file search
+    location for deb / system installs.
+  * Enables SSH BatchMode for all remote command invocation except initial host
+    check / version identification.
+  * Fixes a bug in ghe-backup where Git GC process detection would misclassify
+    long-running server processes matching /git.*gc/, causing the backup operation
+    to timeout.
+  * Adds a note and link to the Migrating from GitHub Enterprise v11.10.34x to
+    v2.0 documentation in the README.
+  * Adds example / documentation for the GHE_EXTRA_SSH_OPTS config value to the
+    backup.config-example file.
+
+ -- Ryan Tomayko <ryan@github.com>  Mon, 17 Nov 2014 12:47:22 +0000
+
 github-backup-utils (2.0.0) UNRELEASED; urgency=medium
 
   * Support for GitHub Enterprise 2.0.

From b3e5e6c21311ec7ec32946a1cacc926dd49e2373 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 17 Nov 2014 22:02:00 -0800
Subject: [PATCH 016/288] v2.0.1 release


From f15cc95503f3f82474fd8ad0f197b1b1deffc3f8 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 1 Dec 2014 13:19:15 +0000
Subject: [PATCH 017/288] ghe-restore: check maintenance mode is enabled.

Do this instead of just enabling it unconditionally.

Fixes #62.
---
 bin/ghe-restore                               |  8 +++--
 .../ghe-maintenance-mode-status               | 30 ++++++++++++++++
 test/test-ghe-restore.sh                      | 36 +++++++++++++++++++
 3 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100755 share/github-backup-utils/ghe-maintenance-mode-status

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 48ab357e6..9db3d6c0c 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -147,10 +147,12 @@ if [ "$GHE_VERSION_MAJOR" -le 1 ] && [ "$GHE_BACKUP_STRATEGY" = "rsync" ]; then
     fi
 fi
 
-# Make sure the GitHub appliance is in maintenance mode and all writing
-# processes have bled out.
+# Make sure the GitHub appliance is in maintenance mode.
 if $instance_configured; then
-    ghe-maintenance-mode-enable "$GHE_HOSTNAME"
+    if ! ghe-maintenance-mode-status "$GHE_HOSTNAME"; then
+        echo "Error: $GHE_HOSTNAME must be put in maintenance mode before restoring. Aborting." 1>&2
+        exit 1
+    fi
 fi
 
 # Restore settings and license if restoring to an unconfigured appliance or when
diff --git a/share/github-backup-utils/ghe-maintenance-mode-status b/share/github-backup-utils/ghe-maintenance-mode-status
new file mode 100755
index 000000000..0d88181ef
--- /dev/null
+++ b/share/github-backup-utils/ghe-maintenance-mode-status
@@ -0,0 +1,30 @@
+#!/bin/sh
+#/ Usage: ghe-maintenance-mode-status <host>
+#/ Checks the status of maintenance mode on GitHub appliance at <host>.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Parse args
+while true; do
+    case "$1" in
+        -*)
+            echo "ghe-maintenance-mode-enable: illegal argument: $1" 1>&2
+            exit 1
+            ;;
+        *)
+            break
+            ;;
+    esac
+done
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+host="$1"
+
+# Check if the maintenance page is present
+ghe-ssh "$host" -- test -e $GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index f4e3b509a..9d2570329 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -76,6 +76,10 @@ begin_test "ghe-restore into configured vm"
         touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
     fi
 
+    # create file used to determine if instance is in maintenance mode.
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -133,6 +137,10 @@ begin_test "ghe-restore aborts without user verification"
         touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
     fi
 
+    # create file used to determine if instance is in maintenance mode.
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -160,6 +168,10 @@ begin_test "ghe-restore accepts user verification"
         touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
     fi
 
+    # create file used to determine if instance is in maintenance mode.
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -182,6 +194,10 @@ begin_test "ghe-restore -c into unconfigured vm"
     GHE_RESTORE_HOST=127.0.0.1
     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"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # run ghe-restore and write output to file for asserting against
     if ! ghe-restore -v -f -c > "$TRASHDIR/restore-out" 2>&1; then
         cat "$TRASHDIR/restore-out"
@@ -227,6 +243,10 @@ begin_test "ghe-restore into unconfigured vm"
     GHE_RESTORE_HOST=127.0.0.1
     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"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     if [ "$GHE_VERSION_MAJOR" -le 1 ]; then
         # run ghe-restore and write output to file for asserting against
         # this should fail due to the appliance being in an unconfigured state
@@ -284,6 +304,10 @@ begin_test "ghe-restore with host arg"
         touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
     fi
 
+    # create file used to determine if instance is in maintenance mode.
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -323,6 +347,10 @@ begin_test "ghe-restore no host arg or configured restore host"
         touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
     fi
 
+    # create file used to determine if instance is in maintenance mode.
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # unset configured restore host
     unset GHE_RESTORE_HOST
 
@@ -344,6 +372,10 @@ begin_test "ghe-restore with no pages backup"
         touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
     fi
 
+    # create file used to determine if instance is in maintenance mode.
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # remove pages data
     rm -rf "$GHE_DATA_DIR/1/pages"
 
@@ -365,6 +397,10 @@ begin_test "ghe-restore with tarball strategy"
         touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
     fi
 
+    # create file used to determine if instance is in maintenance mode.
+    mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
     # run it
     echo "tarball" > "$GHE_DATA_DIR/current/strategy"
     output=$(ghe-restore -v -f localhost)

From ac3588466231d36541f5a1b0d5ac2c3af626dc45 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 8 Dec 2014 18:50:38 +0000
Subject: [PATCH 018/288] Fix quoting of GHE_REMOTE_DATA_DIR

Handle the case in which it might have spaces.
---
 share/github-backup-utils/ghe-maintenance-mode-status | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-maintenance-mode-status b/share/github-backup-utils/ghe-maintenance-mode-status
index 0d88181ef..679ebb894 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-status
+++ b/share/github-backup-utils/ghe-maintenance-mode-status
@@ -27,4 +27,4 @@ done
 host="$1"
 
 # Check if the maintenance page is present
-ghe-ssh "$host" -- test -e $GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html
+ghe-ssh "$host" -- test -e "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"

From a826aca5f6e975cd3127bb08052670ba3a439cfb Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Fri, 12 Dec 2014 18:09:08 +0000
Subject: [PATCH 019/288] Append newline when reading in settings

Some sed implementations, like that on Solaris, don't process lines which don't end in EOL/newline. Forcing a newline helps these versions.
---
 share/github-backup-utils/ghe-restore-settings | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index f3decf008..0c5aaa054 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -26,11 +26,11 @@ GHE_RESTORE_SNAPSHOT_PATH="$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
 echo "Restoring settings ..."
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
   # work around issue importing settings with bad storage mode values
-  cat "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" |
+  ( cat "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" && echo ) |
     sed 's/"storage_mode": "device"/"storage_mode": "rootfs"/' |
     ghe-ssh "$GHE_HOSTNAME" -- '/usr/bin/env GHEBUVER=2 ghe-import-settings' 1>&3
 else
-    cat "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" |
+    ( cat "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" && echo ) |
     ghe-ssh "$GHE_HOSTNAME" -- '/usr/bin/env GHEBUVER=2 ghe-import-settings' 1>&3
 fi
 

From f7c15c5d4afad52fe4875a1af890c74442cec41f Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Fri, 12 Dec 2014 18:24:38 +0000
Subject: [PATCH 020/288] Switch grep -q for >/dev/null

This makes the grep commands cross-platform compatible.
---
 bin/ghe-host-check                                      | 4 ++--
 bin/ghe-restore                                         | 2 +-
 share/github-backup-utils/ghe-backup-repositories-rsync | 2 +-
 share/github-backup-utils/ghe-restore-es-rsync          | 2 +-
 share/github-backup-utils/ghe-ssh                       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 51a7d7232..60d1c5766 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -31,7 +31,7 @@ set -e
 if [ $rc -ne 0 ]; then
     case $rc in
         255)
-            if echo "$output" | grep -i -q "port 22: connection refused"; then
+            if echo "$output" | grep -i "port 22: connection refused" >/dev/null; then
                 exec "$0" "$hostname:122"
             fi
 
@@ -44,7 +44,7 @@ if [ $rc -ne 0 ]; then
             echo "Error: couldn't read GitHub Enterprise fingerprint on '$host' or this isn't a GitHub appliance." 1>&2
             ;;
         1)
-            if [ "${port:-22}" -eq 22 ] && echo "$output" | grep -q "use port 122"; then
+            if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
                 exec "$0" "$hostname:122"
             else
                 echo "$output" 1>&2
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 9db3d6c0c..eeab45fd1 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -139,7 +139,7 @@ fi
 
 # Restoring Elasticsearch to 11.10.3x via rsync requires GNU tar
 if [ "$GHE_VERSION_MAJOR" -le 1 ] && [ "$GHE_BACKUP_STRATEGY" = "rsync" ]; then
-    if ! tar --version | grep -q GNU; then
+    if ! tar --version | grep GNU >/dev/null; then
         if ! command -v gtar >/dev/null 2>&1; then
             echo "GNU tar is required.  Aborting." >&2
             exit 1
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 1f4a1a4ec..ee8182b4c 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -76,7 +76,7 @@ echo "
     while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
         # note: the bracket synta[x] below is to prevent matches against the
         # grep process itself.
-        if ps axo args | grep -q -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)'; then
+        if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
             sleep 1
             sanity=\$(( sanity + 1 ))
         else
diff --git a/share/github-backup-utils/ghe-restore-es-rsync b/share/github-backup-utils/ghe-restore-es-rsync
index 19a78f4d7..d1b769339 100755
--- a/share/github-backup-utils/ghe-restore-es-rsync
+++ b/share/github-backup-utils/ghe-restore-es-rsync
@@ -57,7 +57,7 @@ elif [ "$GHE_VERSION_MAJOR" -gt 1 ]; then
 else
     # Use GNU tar on BSDs.
     TAR=tar
-    if ! tar --version | grep -q GNU; then
+    if ! tar --version | grep GNU >/dev/null; then
             TAR=gtar
     fi
     cd "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 270db5cc8..ec161297e 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -51,7 +51,7 @@ opts="-l $user $opts"
 
 # Bail out with error if the simple command form is used with complex commands.
 # Complex
-if echo "$*" | grep -q "[|;]" || [ $(echo "$*" | wc -l) -gt 1 ]; then
+if echo "$*" | grep "[|;]" >/dev/null || [ $(echo "$*" | wc -l) -gt 1 ]; then
     echo "fatal: ghe-ssh: Attempt to invoke complex command with simple command form." 1>&2
     echo "See ghe-ssh --help for more on correcting." 1>&2
     exit 1

From 101cfb5764f433da3f5775daf9e40a9d572af020 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Tue, 16 Dec 2014 14:27:18 +0000
Subject: [PATCH 021/288] Add test to check for bashisms.

As discussed here:
https://github.com/github/backup-utils/issues/85#issuecomment-66679219
---
 test/test-bashisms.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100755 test/test-bashisms.sh

diff --git a/test/test-bashisms.sh b/test/test-bashisms.sh
new file mode 100755
index 000000000..a419ed797
--- /dev/null
+++ b/test/test-bashisms.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# bashisms tests
+
+# Bring in testlib
+. $(dirname "$0")/testlib.sh
+
+begin_test "ghe-* bashisms"
+(
+    set -e
+    checkbashisms -f "$ROOTDIR/bin/ghe-"*
+)
+end_test

From e828772285109f6fc71e4560a5febcd55009bb69 Mon Sep 17 00:00:00 2001
From: Elijah Buck <elijah@github.com>
Date: Wed, 14 Jan 2015 09:44:02 -0800
Subject: [PATCH 022/288] report mysqldump failures

---
 bin/ghe-backup                    | 4 ++--
 share/github-backup-utils/ghe-ssh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 9c42bc6eb..47031ccad 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -100,8 +100,8 @@ ghe-ssh "$GHE_HOSTNAME" -- 'ghe-export-ssh-host-keys' > ssh-host-keys.tar ||
 failures="$failures ssh-host-keys"
 
 echo "Backing up MySQL database ..."
-echo 'ghe-export-mysql | gzip' |
-ghe-ssh "$GHE_HOSTNAME" -- /bin/sh > mysql.sql.gz ||
+echo 'set -o pipefail; ghe-export-mysql | gzip' |
+ghe-ssh "$GHE_HOSTNAME" -- /bin/bash > mysql.sql.gz ||
 failures="$failures mysql"
 
 echo "Backing up Redis database ..."
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index ec161297e..c10e3848f 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #/ Usage: ghe-ssh [<option>...] <host> [<simple-command>...]
-#/        echo <complex-command>... | ghe-ssh [<option>...] <host> /bin/sh
+#/        echo 'set -o pipefail; <complex-command>...' | ghe-ssh [<option>...] <host> /bin/bash
 #/ Helper to ssh into a GitHub instance with the right user and port. The first
 #/ form should be used for simple commands; the second form should be used for
 #/ complex commands that include pipelines or multiple commands.
@@ -51,7 +51,7 @@ opts="-l $user $opts"
 
 # Bail out with error if the simple command form is used with complex commands.
 # Complex
-if echo "$*" | grep "[|;]" >/dev/null || [ $(echo "$*" | wc -l) -gt 1 ]; then
+if echo "$*" | grep -q "[|;]" || [ $(echo "$*" | wc -l) -gt 1 ]; then
     echo "fatal: ghe-ssh: Attempt to invoke complex command with simple command form." 1>&2
     echo "See ghe-ssh --help for more on correcting." 1>&2
     exit 1

From 2acbdfd3c3022f98a9e85b4eec4f4125cb62ca1f Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 16:28:28 -0500
Subject: [PATCH 023/288] Flip back away from grep -q

See https://github.com/github/backup-utils/pull/86. Think this was
just stomped from an earlier version.
---
 share/github-backup-utils/ghe-ssh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index c10e3848f..72daa7dde 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -51,7 +51,7 @@ opts="-l $user $opts"
 
 # Bail out with error if the simple command form is used with complex commands.
 # Complex
-if echo "$*" | grep -q "[|;]" || [ $(echo "$*" | wc -l) -gt 1 ]; then
+if echo "$*" | grep "[|;]" >/dev/null || [ $(echo "$*" | wc -l) -gt 1 ]; then
     echo "fatal: ghe-ssh: Attempt to invoke complex command with simple command form." 1>&2
     echo "See ghe-ssh --help for more on correcting." 1>&2
     exit 1

From 28050aba1a71ebbd337c5bd89eaccfa81056e207 Mon Sep 17 00:00:00 2001
From: "Scott J. Goldman" <scottjg@github.com>
Date: Wed, 19 Nov 2014 21:50:28 -0800
Subject: [PATCH 024/288] Use the right metadata file for version checks

@dbussink just cleaned up the metadata files (the version number used to
be specified in 4 different places), and this wasn't the file that he
decided to keep. This needs to be updated or we can't recognize VMs running
the next version of GHE.
---
 share/github-backup-utils/ghe-backup-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 4b9df7f6a..531281c06 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -110,9 +110,9 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
 : ${GHE_REMOTE_LICENSE_FILE:="$GHE_REMOTE_DATA_DIR/enterprise/enterprise.ghl"}
 
 # The location of the metadata file on the remote side. This is always
-# "/data/enterprise/chef_metadata.json" for GitHub instances. Use of this variable
+# "/data/enterprise/metadata.json" for GitHub instances. Use of this variable
 # allows the location to be overridden in tests.
-: ${GHE_REMOTE_METADATA_FILE:="$GHE_REMOTE_DATA_DIR/enterprise/chef_metadata.json"}
+: ${GHE_REMOTE_METADATA_FILE:="$GHE_REMOTE_DATA_DIR/enterprise/metadata.json"}
 
 # CPU and IO throttling to keep backups and restores from thrashing around.
 : ${GHE_NICE:="nice -n 19"}

From 60d8a4b5df841600a9779c93562550690518033e Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 14 Jan 2015 14:59:29 +0000
Subject: [PATCH 025/288] Use the new ghe-negotiate-version script.

Make use of the newly added ghe-negotiate-version script to push more of the
version checking logic to the appliance.
---
 .gitignore                                  |  1 +
 bin/ghe-host-check                          | 19 ++++++++++++++++---
 script/package-tarball                      | 11 +++++++++--
 share/github-backup-utils/ghe-backup-config |  7 ++++++-
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 246384181..ba09ab911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /backup.config
 /data
 /dist
+/.version
diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 60d1c5766..ddc9c61c0 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -24,8 +24,13 @@ port=$(ssh_port_part "$host")
 hostname=$(ssh_host_part "$host")
 
 set +e
-output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
+output=$(echo "(which ghe-negotiate-version || exit 127) && ghe-negotiate-version backup-utils $BACKUP_UTILS_VERSION" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
 rc=$?
+if [ $rc = 127 ]; then
+  legacy_version_output="1"
+  output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
+  rc=$?
+fi
 set -e
 
 if [ $rc -ne 0 ]; then
@@ -47,6 +52,9 @@ if [ $rc -ne 0 ]; then
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
                 exec "$0" "$hostname:122"
             else
+                if [ -z "$legacy_version_output" ]; then
+                  echo "Error: $host does not support backup-utils $BACKUP_UTILS_VERSION." 1>&2
+                fi
                 echo "$output" 1>&2
             fi
             ;;
@@ -55,9 +63,14 @@ if [ $rc -ne 0 ]; then
     exit $rc
 fi
 
-version=$(echo "$output" | grep version | cut -d'"' -f4)
+if [ -z "$legacy_version_output" ]; then
+  version=$(echo "$output" | grep "GitHub Enterprise version" | grep -o "[0-9]*\.[0-9]*\.[0-9]*")
+else
+  version=$(echo "$output" | grep version | cut -d'"' -f4)
+fi
+
 if [ -z "$version" ]; then
-    echo "Error: failed to parse version from $GHE_REMOTE_METADATA_FILE on '$host' or this isn't a GitHub appliance." 1>&2
+    echo "Error: failed to parse version on '$host' or this isn't a GitHub appliance." 1>&2
     exit 2
 fi
 
diff --git a/script/package-tarball b/script/package-tarball
index 6229cc33d..01c58da8f 100755
--- a/script/package-tarball
+++ b/script/package-tarball
@@ -17,11 +17,18 @@ PKG_NAME="${PKG_BASE}-${PKG_VERS}"
 echo "Creating ${PKG_NAME}.tar.gz ..."
 mkdir -p dist
 git archive \
-    --format=tar.gz \
+    --format=tar \
     --prefix="$PKG_NAME/" \
-    --output="dist/${PKG_NAME}.tar.gz" \
+    --output="dist/${PKG_NAME}.tar" \
     HEAD
 
+mkdir -p "dist/tmp/$PKG_NAME"
+echo "$PKG_VERS" > "dist/tmp/$PKG_NAME/.version"
+(cd "dist/tmp" && tar -rf "../${PKG_NAME}.tar" "$PKG_NAME/.version")
+rm -rf "dist/tmp"
+
+gzip "dist/${PKG_NAME}.tar"
+
 # List archive contents for review
 gzip -dc < "dist/${PKG_NAME}.tar.gz" | tar tf -
 
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 531281c06..464e4fa53 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -15,6 +15,10 @@
 # scripts source us in according to the instructions above.
 GHE_BACKUP_ROOT="$(pwd)"
 
+# Get the version from the last tag with the 'v' removed from the front.
+BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/.version 2>/dev/null || git describe --tags)"
+BACKUP_UTILS_VERSION="$(echo $BACKUP_UTILS_VERSION | sed -e 's/^v//')"
+
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 
@@ -109,7 +113,8 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
 # allows the location to be overridden in tests.
 : ${GHE_REMOTE_LICENSE_FILE:="$GHE_REMOTE_DATA_DIR/enterprise/enterprise.ghl"}
 
-# The location of the metadata file on the remote side. This is always
+# The legacy location of the metadata file on the remote side. Only used if
+# the newer "ghe-negotiate-version" script cannot be found or fails. This was
 # "/data/enterprise/metadata.json" for GitHub instances. Use of this variable
 # allows the location to be overridden in tests.
 : ${GHE_REMOTE_METADATA_FILE:="$GHE_REMOTE_DATA_DIR/enterprise/metadata.json"}

From f9bc1d9c5cee017d131699e46b885dd1a5d08b25 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 16:53:13 -0500
Subject: [PATCH 026/288] Axe manual which, /bin/sh will exit 127 here

ionice exits 1 if the command given to it cannot be found but in
this case we're running /bin/sh which will always be found. The 127
exit from /bin/sh is propagated properly when the
ghe-negotiate-version program isn't found.
---
 bin/ghe-host-check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index ddc9c61c0..9b4b390e0 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -24,7 +24,7 @@ port=$(ssh_port_part "$host")
 hostname=$(ssh_host_part "$host")
 
 set +e
-output=$(echo "(which ghe-negotiate-version || exit 127) && ghe-negotiate-version backup-utils $BACKUP_UTILS_VERSION" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
+output=$(echo "ghe-negotiate-version backup-utils $BACKUP_UTILS_VERSION" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
 rc=$?
 if [ $rc = 127 ]; then
   legacy_version_output="1"

From 2949b2a3d2cdcff4477fc79e65d89dbab0a8fbf3 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 17:02:00 -0500
Subject: [PATCH 027/288] Quick comment on fallback logic

---
 bin/ghe-host-check | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 9b4b390e0..3dfb58af1 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -27,6 +27,7 @@ set +e
 output=$(echo "ghe-negotiate-version backup-utils $BACKUP_UTILS_VERSION" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
 rc=$?
 if [ $rc = 127 ]; then
+  # ghe-negotiate-version not found, fallback to reading version file
   legacy_version_output="1"
   output=$(echo "cat \"$GHE_REMOTE_METADATA_FILE\" 2>/dev/null || exit 101" | ghe-ssh -o BatchMode=no $options $host -- /bin/sh 2>&1)
   rc=$?

From 62aed603ef3e2fb90e25696895eae139bd9cc832 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 17:02:26 -0500
Subject: [PATCH 028/288] Axe duplicate error messages when
 ghe-negotiate-version mismatches

---
 bin/ghe-host-check | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 3dfb58af1..336d3f5ea 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -53,9 +53,6 @@ if [ $rc -ne 0 ]; then
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
                 exec "$0" "$hostname:122"
             else
-                if [ -z "$legacy_version_output" ]; then
-                  echo "Error: $host does not support backup-utils $BACKUP_UTILS_VERSION." 1>&2
-                fi
                 echo "$output" 1>&2
             fi
             ;;

From fec20e7b7ea2cf9968686538b12d1248d7400e79 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 17:04:37 -0500
Subject: [PATCH 029/288] Revert "Use the right metadata file for version
 checks"

This reverts commit 28050aba1a71ebbd337c5bd89eaccfa81056e207.

I'm not sure we can rely on this new file location being present on
versions pre-2.0 so reverting back. The ghe-negotiate-version
program should be available on anything >= 2.1 and the
chef_metadata.json should be available on anything < 2.1.
---
 share/github-backup-utils/ghe-backup-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 464e4fa53..b44e61aa5 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -117,7 +117,7 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
 # the newer "ghe-negotiate-version" script cannot be found or fails. This was
 # "/data/enterprise/metadata.json" for GitHub instances. Use of this variable
 # allows the location to be overridden in tests.
-: ${GHE_REMOTE_METADATA_FILE:="$GHE_REMOTE_DATA_DIR/enterprise/metadata.json"}
+: ${GHE_REMOTE_METADATA_FILE:="$GHE_REMOTE_DATA_DIR/enterprise/chef_metadata.json"}
 
 # CPU and IO throttling to keep backups and restores from thrashing around.
 : ${GHE_NICE:="nice -n 19"}

From 086209593952b9cc5b28f05ef4caf96859f150e7 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 17:11:45 -0500
Subject: [PATCH 030/288] Always read version from
 share/github-backup-utils/version

I'm weary of relying on git-describe and all the different paths
here. Just keeping the file versioned manually is a lot simpler for
now and basing the version off of tags doesn't buy us a lot.
---
 .gitignore                                  |  1 -
 script/package-tarball                      | 11 ++---------
 share/github-backup-utils/ghe-backup-config |  5 ++---
 share/github-backup-utils/version           |  1 +
 4 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 share/github-backup-utils/version

diff --git a/.gitignore b/.gitignore
index ba09ab911..246384181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /backup.config
 /data
 /dist
-/.version
diff --git a/script/package-tarball b/script/package-tarball
index 01c58da8f..6229cc33d 100755
--- a/script/package-tarball
+++ b/script/package-tarball
@@ -17,18 +17,11 @@ PKG_NAME="${PKG_BASE}-${PKG_VERS}"
 echo "Creating ${PKG_NAME}.tar.gz ..."
 mkdir -p dist
 git archive \
-    --format=tar \
+    --format=tar.gz \
     --prefix="$PKG_NAME/" \
-    --output="dist/${PKG_NAME}.tar" \
+    --output="dist/${PKG_NAME}.tar.gz" \
     HEAD
 
-mkdir -p "dist/tmp/$PKG_NAME"
-echo "$PKG_VERS" > "dist/tmp/$PKG_NAME/.version"
-(cd "dist/tmp" && tar -rf "../${PKG_NAME}.tar" "$PKG_NAME/.version")
-rm -rf "dist/tmp"
-
-gzip "dist/${PKG_NAME}.tar"
-
 # List archive contents for review
 gzip -dc < "dist/${PKG_NAME}.tar.gz" | tar tf -
 
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index b44e61aa5..53fc41e4f 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -15,9 +15,8 @@
 # scripts source us in according to the instructions above.
 GHE_BACKUP_ROOT="$(pwd)"
 
-# Get the version from the last tag with the 'v' removed from the front.
-BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/.version 2>/dev/null || git describe --tags)"
-BACKUP_UTILS_VERSION="$(echo $BACKUP_UTILS_VERSION | sed -e 's/^v//')"
+# Get the version from the version file.
+BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version | sed 's/^v//')"
 
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
new file mode 100644
index 000000000..0ac852dde
--- /dev/null
+++ b/share/github-backup-utils/version
@@ -0,0 +1 @@
+v2.0.1

From dd75a8227fafc6dc88641d343be517a668efcef4 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 17:36:55 -0500
Subject: [PATCH 031/288] Avoid double grep and grep -o (portability)

---
 bin/ghe-host-check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 336d3f5ea..a39041890 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -62,7 +62,7 @@ if [ $rc -ne 0 ]; then
 fi
 
 if [ -z "$legacy_version_output" ]; then
-  version=$(echo "$output" | grep "GitHub Enterprise version" | grep -o "[0-9]*\.[0-9]*\.[0-9]*")
+  version=$(echo "$output" | sed -n 's/GitHub Enterprise version \(.*\)/\1/p')
 else
   version=$(echo "$output" | grep version | cut -d'"' -f4)
 fi

From 9c91bf0855f032482d32fac7397fa7458f4fc2ba Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 17:39:53 -0500
Subject: [PATCH 032/288] Store version file in expected format

---
 share/github-backup-utils/ghe-backup-config | 2 +-
 share/github-backup-utils/version           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 53fc41e4f..969f1155d 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -16,7 +16,7 @@
 GHE_BACKUP_ROOT="$(pwd)"
 
 # Get the version from the version file.
-BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version | sed 's/^v//')"
+BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
 
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 0ac852dde..38f77a65b 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-v2.0.1
+2.0.1

From 2e59641e8b625029310bc36a7022076081c87400 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Wed, 14 Jan 2015 19:37:57 -0500
Subject: [PATCH 033/288] Fix ghe-backup-config test failure due to not being
 in project root dir

---
 test/test-ghe-backup-config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test-ghe-backup-config.sh b/test/test-ghe-backup-config.sh
index cc2263eab..f79052e05 100755
--- a/test/test-ghe-backup-config.sh
+++ b/test/test-ghe-backup-config.sh
@@ -12,7 +12,8 @@ GHE_REMOTE_DATA_DIR="$TRASHDIR/remote"
 export GHE_DATA_DIR GHE_REMOTE_DATA_DIR
 
 # Source in the config script
-. "$ROOTDIR/share/github-backup-utils/ghe-backup-config"
+cd "$ROOTDIR"
+. "share/github-backup-utils/ghe-backup-config"
 
 begin_test "ghe-backup-config ssh_host_part"
 (

From d2dfff65acf83a191acc948defb7e371c6b9236e Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Sat, 17 Jan 2015 12:57:09 -0800
Subject: [PATCH 034/288] Add missing quotes

---
 bin/ghe-backup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 47031ccad..bc94bc2b6 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -37,7 +37,7 @@ GHE_MAINTENANCE_MODE_ENABLED=false
 # The cleanup trap also handles disabling maintenance mode on the appliance if
 # it was automatically enabled.
 cleanup () {
-    if [ $(readlink ../in-progress) = "$GHE_SNAPSHOT_TIMESTAMP" ]; then
+    if [ "$(readlink ../in-progress)" = "$GHE_SNAPSHOT_TIMESTAMP" ]; then
         unlink ../in-progress
     fi
 

From a148b23678b4053ddc8bd8b9e4f18d2226b61684 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 19 Jan 2015 17:20:47 +0000
Subject: [PATCH 035/288] Allow ghe-host-check to be run from within the bin
 directory

---
 bin/ghe-host-check | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index a39041890..d5be624ff 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -38,7 +38,7 @@ if [ $rc -ne 0 ]; then
     case $rc in
         255)
             if echo "$output" | grep -i "port 22: connection refused" >/dev/null; then
-                exec "$0" "$hostname:122"
+                exec "bin/$(basename $0)" "$hostname:122"
             fi
 
             echo "$output" 1>&2
@@ -51,7 +51,7 @@ if [ $rc -ne 0 ]; then
             ;;
         1)
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
-                exec "$0" "$hostname:122"
+                exec "bin/$(basename $0)" "$hostname:122"
             else
                 echo "$output" 1>&2
             fi

From 94019db75270ea5fa3fad0196e89bd881d92dc23 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Tue, 20 Jan 2015 10:54:12 -0500
Subject: [PATCH 036/288] Update debian changelog for 2.0.2 release

---
 debian/changelog | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ded922013..d755f0899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+github-backup-utils (2.0.2) UNRELEASED; urgency=medium
+
+  * ghe-restore now requires that an already-configured appliance be put into
+    maintenance mode manually. This is a safeguard against accidentally
+    overwriting data on the wrong instance. #62, #84
+  * ghe-backup and ghe-restore now run a ghe-negotiate-version program on the
+    appliance to determine whether the backup-utils and GHE versions are
+    compatible. #91
+  * Various portability fixes for problems surfaced when running on Solaris
+    and FreeBSD. #86, #87
+  * Fixes an issue in ghe-backup where mysqldump failures weren't being
+    reported properly. #90
+  * Automated builds are now run on Travis CI. #77
+
+ -- Ryan Tomayko <ryan@github.com>  Tue, 20 Jan 2015 16:00:00 +0000
+
 github-backup-utils (2.0.1) UNRELEASED; urgency=medium
 
   * Adds /etc/github-backup-utils/backup.config as a default config file search

From 00ac8f393ab577ef84a0d919575a7ea9ed3030f0 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Tue, 20 Jan 2015 10:54:33 -0500
Subject: [PATCH 037/288] Update version file for 2.0.2 release

---
 share/github-backup-utils/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 38f77a65b..e9307ca57 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.0.1
+2.0.2

From fad3768299649d10338fffbfd6ef7f694d5cf363 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <r@tomayko.com>
Date: Tue, 20 Jan 2015 11:19:35 -0500
Subject: [PATCH 038/288] Add RELEASING.md with instructions on making a
 release

---
 RELEASING.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 RELEASING.md

diff --git a/RELEASING.md b/RELEASING.md
new file mode 100644
index 000000000..69a45cb41
--- /dev/null
+++ b/RELEASING.md
@@ -0,0 +1,12 @@
+# Making a backup-utils release
+
+ 1. Add a new version and release notes to the `debian/changelog` file.
+ 2. Rev the `share/github-backup-utils/version` file.
+ 3. Tag the release: `git tag v2.0.2`
+ 4. Build that tarball package: `make dist`
+ 5. Install the debian devscripts package if necessary:
+    `sudo apt-get install devscripts`
+ 6. Build the deb package: `debuild -uc -us`
+ 7. Draft a new release at https://github.com/github/backup-utils/releases,
+    including the release notes and attaching the tarball and deb packages.
+ 8. Push the head of the release to the 'stable' branch.

From 290a6ca344306b5d491ea05371016466dd38fb94 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Wed, 28 Jan 2015 11:25:37 +0000
Subject: [PATCH 039/288] Document -c option

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7c702f69d..a78ed365b 100644
--- a/README.md
+++ b/README.md
@@ -153,6 +153,8 @@ The `ghe-backup` and `ghe-restore` commands also have a verbose output mode
 (`-v`) that lists files as they're being transferred. It's often useful to
 enable when output is logged to a file.
 
+The settings and license are not restored by default to prevent overwriting different configuration on the restore host. Restore appliance settings and license in addition to datastores by passing the `-c` argument to `ghe-restore`
+
 ### Scheduling backups
 
 Regular backups should be scheduled using `cron(8)` or similar command

From 14858b7dd2fc5c0d72d771b193b36b37e39729a8 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 14:32:52 +0000
Subject: [PATCH 040/288] Call ghe-storage-prepare directly

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index eeab45fd1..284a1b310 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -199,7 +199,7 @@ ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 # config run to perform data migrations.
 if [ "$GHE_VERSION_MAJOR" -ge 2 ] && $instance_configured; then
     echo "Configuring storage ..."
-    ghe-ssh "$GHE_HOSTNAME" -- "sudo ghe-config-apply" 1>&3
+    ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-storage-prepare" 1>&3 2>&3
 fi
 
 # Update the remote status to "complete". This has to happen before importing

From 55d867692d62fe5c4d5934fbe8e5fe6d540aa091 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 14:34:25 +0000
Subject: [PATCH 041/288] Kick off config run on 11.10.34x too

---
 bin/ghe-restore | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 284a1b310..b4115b38d 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -195,11 +195,16 @@ ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT
 echo "Restoring Elasticsearch indices ..."
 ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 
-# When restoring to a 2.x host that has already been configured, kick off a
+# When restoring to a host that has already been configured, kick off a
 # config run to perform data migrations.
-if [ "$GHE_VERSION_MAJOR" -ge 2 ] && $instance_configured; then
-    echo "Configuring storage ..."
+if [ $instance_configured ]; then
+  echo "Configuring storage ..."
+  if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-storage-prepare" 1>&3 2>&3
+  else
+    echo "   This will take several minutes to complete..."
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo /usr/sbin/enterprise-configure" 1>&3 2>&3
+  fi
 fi
 
 # Update the remote status to "complete". This has to happen before importing

From c2c243da03295466247202930c81044f86a010bd Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 16:08:51 +0000
Subject: [PATCH 042/288] No need for full path on .340

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index b4115b38d..6a01a5294 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -203,7 +203,7 @@ if [ $instance_configured ]; then
     ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-storage-prepare" 1>&3 2>&3
   else
     echo "   This will take several minutes to complete..."
-    ghe-ssh "$GHE_HOSTNAME" -- "sudo /usr/sbin/enterprise-configure" 1>&3 2>&3
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo enterprise-configure" 1>&3 2>&3
   fi
 fi
 

From 23a7d4191c3232c62c9c7b851aeb2713f459ba1b Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 16:09:22 +0000
Subject: [PATCH 043/288] Scrub /usr/local/share/enterprise from cmd path

This allows us to easily use our test ghe-storage-prepare script like all the others in test/bin
---
 test/bin/ssh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/bin/ssh b/test/bin/ssh
index 56cf6ca57..8dc517315 100755
--- a/test/bin/ssh
+++ b/test/bin/ssh
@@ -33,6 +33,9 @@ cd "$(dirname "$0")"/..
 # Scrub sudo commands from command arguments.
 sh="$(echo "$@" | sed 's/sudo -u [a-z]* //g' | sed 's/sudo //g')"
 
+# Scrub /usr/local/share/enterprise/ from commands
+sh="$(echo "$sh" | sed 's|/usr/local/share/enterprise/||g')"
+
 # Also scrub sudo commands from stdin if just executing /bin/sh and
 # piping commands in on standard input.
 if echo "$*" | grep -q "/bin/sh$"; then

From 586c7eb27d850ab05823c44dee960e236fc0ed9b Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 16:11:49 +0000
Subject: [PATCH 044/288] Add emulation commands

---
 test/bin/enterprise-configure | 6 ++++++
 test/bin/ghe-storage-prepare  | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100755 test/bin/enterprise-configure
 create mode 100755 test/bin/ghe-storage-prepare

diff --git a/test/bin/enterprise-configure b/test/bin/enterprise-configure
new file mode 100755
index 000000000..1e553bafe
--- /dev/null
+++ b/test/bin/enterprise-configure
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Usage: enterprise-configure
+# Emulates the remote GitHub enterprise-configure command. Tests use this
+# to assert that the command was executed.
+set -e
+echo "enterprise-configure OK"
diff --git a/test/bin/ghe-storage-prepare b/test/bin/ghe-storage-prepare
new file mode 100755
index 000000000..1015eccf9
--- /dev/null
+++ b/test/bin/ghe-storage-prepare
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Usage: ghe-storage-prepare
+# Emulates the remote GitHub ghe-storage-prepare command. Tests use this
+# to assert that the command was executed.
+set -e
+echo "ghe-storage-prepare OK"

From d2b448d76e8c1e4366553d3d355e351431d2c282 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 17:38:45 +0000
Subject: [PATCH 045/288] Revert "Add emulation commands"

This reverts commit 586c7eb27d850ab05823c44dee960e236fc0ed9b.
---
 test/bin/enterprise-configure | 6 ------
 test/bin/ghe-storage-prepare  | 6 ------
 2 files changed, 12 deletions(-)
 delete mode 100755 test/bin/enterprise-configure
 delete mode 100755 test/bin/ghe-storage-prepare

diff --git a/test/bin/enterprise-configure b/test/bin/enterprise-configure
deleted file mode 100755
index 1e553bafe..000000000
--- a/test/bin/enterprise-configure
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Usage: enterprise-configure
-# Emulates the remote GitHub enterprise-configure command. Tests use this
-# to assert that the command was executed.
-set -e
-echo "enterprise-configure OK"
diff --git a/test/bin/ghe-storage-prepare b/test/bin/ghe-storage-prepare
deleted file mode 100755
index 1015eccf9..000000000
--- a/test/bin/ghe-storage-prepare
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Usage: ghe-storage-prepare
-# Emulates the remote GitHub ghe-storage-prepare command. Tests use this
-# to assert that the command was executed.
-set -e
-echo "ghe-storage-prepare OK"

From 3901d813fe63be7d3fae7eb592aa073b25ddd4eb Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 17:39:08 +0000
Subject: [PATCH 046/288] Revert "Scrub /usr/local/share/enterprise from cmd
 path"

This reverts commit 23a7d4191c3232c62c9c7b851aeb2713f459ba1b.
---
 test/bin/ssh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/bin/ssh b/test/bin/ssh
index 8dc517315..56cf6ca57 100755
--- a/test/bin/ssh
+++ b/test/bin/ssh
@@ -33,9 +33,6 @@ cd "$(dirname "$0")"/..
 # Scrub sudo commands from command arguments.
 sh="$(echo "$@" | sed 's/sudo -u [a-z]* //g' | sed 's/sudo //g')"
 
-# Scrub /usr/local/share/enterprise/ from commands
-sh="$(echo "$sh" | sed 's|/usr/local/share/enterprise/||g')"
-
 # Also scrub sudo commands from stdin if just executing /bin/sh and
 # piping commands in on standard input.
 if echo "$*" | grep -q "/bin/sh$"; then

From 93895067b074bd6bc8eb766e6dc72aad7c8053d8 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 17:40:51 +0000
Subject: [PATCH 047/288] Switch back to ghe-config-apply

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 6a01a5294..80f80b669 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -200,7 +200,7 @@ ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 if [ $instance_configured ]; then
   echo "Configuring storage ..."
   if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-storage-prepare" 1>&3 2>&3
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo ghe-config-apply" 1>&3
   else
     echo "   This will take several minutes to complete..."
     ghe-ssh "$GHE_HOSTNAME" -- "sudo enterprise-configure" 1>&3 2>&3

From 002113449ed11e0336d908376d405ff2a697883e Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 17:43:53 +0000
Subject: [PATCH 048/288] Add enterprise-configure cmd emulation

---
 test/bin/enterprise-configure | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 test/bin/enterprise-configure

diff --git a/test/bin/enterprise-configure b/test/bin/enterprise-configure
new file mode 100644
index 000000000..1e553bafe
--- /dev/null
+++ b/test/bin/enterprise-configure
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Usage: enterprise-configure
+# Emulates the remote GitHub enterprise-configure command. Tests use this
+# to assert that the command was executed.
+set -e
+echo "enterprise-configure OK"

From 443e9d6a89b5a5e13c4969d3d6831468d55107a7 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 2 Feb 2015 17:50:46 +0000
Subject: [PATCH 049/288] Add exec perms to enterprise-configure emulation

---
 test/bin/enterprise-configure | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 test/bin/enterprise-configure

diff --git a/test/bin/enterprise-configure b/test/bin/enterprise-configure
old mode 100644
new mode 100755

From 1de3dd46132cf76536b6bf5eb037ef336fe595e3 Mon Sep 17 00:00:00 2001
From: Twan Wolthof <twan@xeago.nl>
Date: Wed, 4 Feb 2015 16:34:19 +0100
Subject: [PATCH 050/288] Add devscripts to debian's build-depends for
 checkbashisms

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index c7a42cc30..4c9bb61b9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Twan Wolthof <xeago@spotify.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 9), git
+Build-Depends: debhelper (>= 9), git, devscripts
 
 Package: github-backup-utils
 Architecture: any

From dde67ef0db0c68436d46f6ac971314e4f8ca367a Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Thu, 12 Feb 2015 15:44:04 +0000
Subject: [PATCH 051/288] Always specify ssh port

---
 share/github-backup-utils/ghe-ssh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 72daa7dde..19e6e4029 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -41,9 +41,6 @@ fi
 port=$(ssh_port_part "$host")
 host=$(ssh_host_part "$host")
 
-# Add port / -p option when non-standard port given.
-[ "$port" != "22" ] && opts="-p $port $opts"
-
 # Add user / -l option
 user="${host%@*}"
 [ "$user" = "$host" ] && user="admin"
@@ -61,4 +58,4 @@ fi
 $GHE_VERBOSE_SSH && set -x
 
 # Exec ssh command with modified host / port args and add nice to command.
-exec ssh $opts -o BatchMode=yes "$host" -- $GHE_NICE $GHE_IONICE "$@"
+exec ssh -p $port $opts -o BatchMode=yes "$host" -- $GHE_NICE $GHE_IONICE "$@"

From 7a76452b4b4666a0b4d963117ec8980e31c57382 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 16 Feb 2015 12:34:58 -0600
Subject: [PATCH 052/288] Automatically run full config run on GHE 2 when
 restoring

2.0.7 and later and 2.1.3 and later will introduce support for `ghe-config-apply --full` so we can now take advantage of this here.
---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 80f80b669..9aa337239 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -200,7 +200,7 @@ ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 if [ $instance_configured ]; then
   echo "Configuring storage ..."
   if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    ghe-ssh "$GHE_HOSTNAME" -- "sudo ghe-config-apply" 1>&3
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo ghe-config-apply --full" 1>&3
   else
     echo "   This will take several minutes to complete..."
     ghe-ssh "$GHE_HOSTNAME" -- "sudo enterprise-configure" 1>&3 2>&3

From 6102180970cc743df2cf052f448667d85ecc6fff Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Tue, 17 Feb 2015 17:50:49 -0600
Subject: [PATCH 053/288] Ensure pages dir exists for rsync

---
 share/github-backup-utils/ghe-backup-pages-rsync | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-pages-rsync b/share/github-backup-utils/ghe-backup-pages-rsync
index 8f470b157..9de913183 100755
--- a/share/github-backup-utils/ghe-backup-pages-rsync
+++ b/share/github-backup-utils/ghe-backup-pages-rsync
@@ -10,5 +10,8 @@ set -e
 cd $(dirname "$0")/../..
 . share/github-backup-utils/ghe-backup-config
 
+# Make sure root backup dir exists if this is the first run
+mkdir -p "$GHE_SNAPSHOT_DIR/pages"
+
 # Use the common user data rsync backup utility.
 ghe-backup-userdata pages

From 1461d6a9891abfef5cbd7a3ca9b550a3a8e694f0 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 19 Feb 2015 08:59:35 -0500
Subject: [PATCH 054/288] Fix bad conditional

The $instance_configured value is either 'true' or 'false' so you
don't need the [] test here. It'll actually evaluate to true since a
single argument test just checks for non-emptyness:

    % [ false ]
    % echo $?
    0

vs.

    % false
    % echo $?
    1
---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 9aa337239..3b8f87bb6 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -197,7 +197,7 @@ ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 
 # When restoring to a host that has already been configured, kick off a
 # config run to perform data migrations.
-if [ $instance_configured ]; then
+if $instance_configured; then
   echo "Configuring storage ..."
   if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     ghe-ssh "$GHE_HOSTNAME" -- "sudo ghe-config-apply --full" 1>&3

From bdd51632440323c420f6c9f96d12e7ce40334362 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 19 Feb 2015 09:30:00 -0500
Subject: [PATCH 055/288] Fix REMOTE_ROOT_DIR not being cleared between tests

This was causing ghe-restore to assume that an instance was
configured due to a previous test touching
$GHE_REMOTE_ROOT_DIR/etc/github/configured, which isn't contained by
GHE_REMOTE_DATA_DIR. Move to resetting GHE_REMOTE_ROOT_DIR between
tests and move GHE_REMOTE_DATA_DIR under GHE_REMOTE_ROOT_DIR.
---
 test/test-ghe-restore.sh | 18 +++++++++---------
 test/testlib.sh          |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 9d2570329..a773018fa 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -66,7 +66,7 @@ echo "rsync" > "$GHE_DATA_DIR/current/strategy"
 begin_test "ghe-restore into configured vm"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # create file used to determine if instance has been configured.
@@ -127,7 +127,7 @@ end_test
 begin_test "ghe-restore aborts without user verification"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # create file used to determine if instance has been configured.
@@ -158,7 +158,7 @@ end_test
 begin_test "ghe-restore accepts user verification"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # create file used to determine if instance has been configured.
@@ -187,7 +187,7 @@ end_test
 begin_test "ghe-restore -c into unconfigured vm"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # set restore host environ var
@@ -236,7 +236,7 @@ end_test
 begin_test "ghe-restore into unconfigured vm"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # set restore host environ var
@@ -294,7 +294,7 @@ end_test
 begin_test "ghe-restore with host arg"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # create file used to determine if instance has been configured.
@@ -337,7 +337,7 @@ end_test
 begin_test "ghe-restore no host arg or configured restore host"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # create file used to determine if instance has been configured.
@@ -362,7 +362,7 @@ end_test
 begin_test "ghe-restore with no pages backup"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # create file used to determine if instance has been configured.
@@ -387,7 +387,7 @@ end_test
 begin_test "ghe-restore with tarball strategy"
 (
     set -e
-    rm -rf "$GHE_REMOTE_DATA_DIR"
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
     setup_remote_metadata
 
     # create file used to determine if instance has been configured.
diff --git a/test/testlib.sh b/test/testlib.sh
index 0b6000b34..18ae9c2d4 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -36,8 +36,8 @@ export GIT_AUTHOR_NAME=make GIT_AUTHOR_EMAIL=make GIT_COMMITTER_NAME=make GIT_CO
 # Point commands at the test backup.config file
 GHE_BACKUP_CONFIG="$ROOTDIR/test/backup.config"
 GHE_DATA_DIR="$TRASHDIR/data"
-GHE_REMOTE_DATA_DIR="$TRASHDIR/remote"
-GHE_REMOTE_ROOT_DIR="$TRASHDIR/root"
+GHE_REMOTE_DATA_DIR="$TRASHDIR/remote/data"
+GHE_REMOTE_ROOT_DIR="$TRASHDIR/remote"
 export GHE_BACKUP_CONFIG GHE_DATA_DIR GHE_REMOTE_DATA_DIR GHE_REMOTE_ROOT_DIR
 
 # The default remote appliance version. This may be set in the environment prior

From 6e2024037a7af53b450f1435ce6dab5260e247e3 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 19 Feb 2015 09:32:29 -0500
Subject: [PATCH 056/288] Verify implicit -c when restoring to unconfigured VM

---
 test/test-ghe-restore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index a773018fa..31eab3410 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -258,7 +258,7 @@ begin_test "ghe-restore into unconfigured vm"
         grep -q -e "Error: $GHE_RESTORE_HOST not configured" "$TRASHDIR/restore-out"
     else
         # under version >= 2.0, ghe-restore into an unconfigured vm implies -c
-        ghe-restore -v -f -c > "$TRASHDIR/restore-out" 2>&1
+        ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1
         cat "$TRASHDIR/restore-out"
 
         # verify connect to right host

From f91a51b46efe01702db510b6750d3b09642f956f Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 19 Feb 2015 09:33:09 -0500
Subject: [PATCH 057/288] Remove superflous conditional in tests

---
 test/test-ghe-restore.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 31eab3410..5ca5e5f0f 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -280,13 +280,14 @@ begin_test "ghe-restore into unconfigured vm"
         # verify all pages data was transferred to the restore location
         diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
-        if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-            # verify all hookshot user data was transferred
-            diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+
+        # verify all alambic assets user data was transferred
+        diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
 
-            # verify all alambic assets user data was transferred
-            diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
-        fi
+        # verify no config run after restore on unconfigured instance
+        ! grep -q "ghe-config-apply OK" "$TRASHDIR/restore-out"
     fi
 )
 end_test

From 84e8e938b0f0b655815f3d5b01aa40c9dea3c42f Mon Sep 17 00:00:00 2001
From: Elijah Buck <elijah@github.com>
Date: Tue, 24 Mar 2015 20:19:43 -0700
Subject: [PATCH 058/288] warn and prompt when replication is configured

---
 bin/ghe-restore | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 3b8f87bb6..f1a1833c0 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -97,6 +97,14 @@ elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     restore_settings=true
 fi
 
+# If you restore to a server in a replication pair
+if ghe-ssh "$GHE_HOSTNAME" -- "ghe-repl-status -r 2>/dev/null" \
+  | grep -E "replica|primary"; then
+  instance_configured=true
+  echo "WARNING: Restoring to a server with replication enabled interrupts replication."
+  echo "You will need to reconfigure replication after the restore completes."
+fi
+
 # Prompt to verify the restore host given is correct. Restoring overwrites
 # important data on the destination appliance that cannot be recovered. This is
 # mostly to prevent accidents where the backup host is given to restore instead

From f517b741571545e4e7236a457a892e3645207894 Mon Sep 17 00:00:00 2001
From: Elijah Buck <elijah@github.com>
Date: Wed, 25 Mar 2015 08:27:33 -0700
Subject: [PATCH 059/288] quiet grep

---
 bin/ghe-restore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index f1a1833c0..cd060bc73 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -97,9 +97,9 @@ elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     restore_settings=true
 fi
 
-# If you restore to a server in a replication pair
+# Figure out if this instance is in a replication pair
 if ghe-ssh "$GHE_HOSTNAME" -- "ghe-repl-status -r 2>/dev/null" \
-  | grep -E "replica|primary"; then
+  | grep -Eq "replica|primary"; then
   instance_configured=true
   echo "WARNING: Restoring to a server with replication enabled interrupts replication."
   echo "You will need to reconfigure replication after the restore completes."

From ad097baee02172783f7fa66a352a2003241375f9 Mon Sep 17 00:00:00 2001
From: Elijah Buck <elijah@github.com>
Date: Thu, 26 Mar 2015 09:54:32 -0700
Subject: [PATCH 060/288] format

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index cd060bc73..4ac6691fc 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -102,7 +102,7 @@ if ghe-ssh "$GHE_HOSTNAME" -- "ghe-repl-status -r 2>/dev/null" \
   | grep -Eq "replica|primary"; then
   instance_configured=true
   echo "WARNING: Restoring to a server with replication enabled interrupts replication."
-  echo "You will need to reconfigure replication after the restore completes."
+  echo "         You will need to reconfigure replication after the restore completes."
 fi
 
 # Prompt to verify the restore host given is correct. Restoring overwrites

From 9761adaf5f4d2624365176ab7c1142ca7efff802 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 30 Mar 2015 17:51:31 -0400
Subject: [PATCH 061/288] script/cibuild builds tarball package

---
 script/cibuild | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/script/cibuild b/script/cibuild
index cb712180e..6577aead8 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -28,3 +28,16 @@ done
 
 # If any of the version tests failed, exit non-zero
 $res
+
+# Build the tarball
+script/package-tarball > package-tarball.txt
+cat package-tarball.txt
+tarball=$(grep '^Package ' < package-tarball.txt | cut -f 2 -d ' ')
+curl -sT- https://wcat.io <"$tarball" || true
+
+# Build the deb packages
+if type debuild 1>/dev/null 2>&1; then
+    debuild
+else
+    echo "debuild not installed, skipping deb packaging ..."
+fi

From d52535f3c2c167686dcaa9d792538844138fb966 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 30 Mar 2015 17:53:57 -0400
Subject: [PATCH 062/288] script/cibuild builds deb package

---
 script/cibuild     |  2 +-
 script/package-deb | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 script/package-deb

diff --git a/script/cibuild b/script/cibuild
index 6577aead8..f468f7f61 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -37,7 +37,7 @@ curl -sT- https://wcat.io <"$tarball" || true
 
 # Build the deb packages
 if type debuild 1>/dev/null 2>&1; then
-    debuild
+    script/package-deb
 else
     echo "debuild not installed, skipping deb packaging ..."
 fi
diff --git a/script/package-deb b/script/package-deb
new file mode 100755
index 000000000..f3190173c
--- /dev/null
+++ b/script/package-deb
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Usage: script/package-deb
+# Script to build a deb release package from the current HEAD version.
+# The package version comes from the debian/changelog file so that should
+# be edited before running this.
+set -e
+
+# Change into project root
+cd "$(dirname "$0")"/..
+
+# Basic package name and version.
+PKG_BASE="github-backup-utils"
+PKG_VERS="$(git describe --tags)"
+PKG_NAME="${PKG_BASE}-${PKG_VERS}"
+PKG_HEAD="$(git rev-parse HEAD)"
+
+# Run git-archive to generate tarball
+echo "Creating ${PKG_NAME}.deb ..."
+rm -rf dist/debuild
+mkdir -p dist/debuild
+distdir="$(pwd)/dist/debuild/$PKG_NAME"
+git clone -q . "$distdir"
+
+cd "$distdir"
+git checkout -q "$PKG_HEAD"
+debuild -uc -us
+find $(dirname $(pwd)) -ls

From 96171b7a497b5207a1609119c10087bacb206d63 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 30 Mar 2015 18:34:20 -0400
Subject: [PATCH 063/288] script/cibuild --no-package runs tests only

---
 Makefile       | 2 +-
 script/cibuild | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 30b73decf..33528374e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 SHELL = /bin/sh
 
 test: info
-	@script/cibuild
+	@script/cibuild --no-package
 
 info:
 	@echo This is github/backup-utils
diff --git a/script/cibuild b/script/cibuild
index f468f7f61..f5aeb11ec 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Usage: script/cibuild
+# Usage: script/cibuild [--no-package]
 set -e
 
 # GHE appliance versions to run tests against. Remote metadata files are put in
@@ -29,6 +29,9 @@ done
 # If any of the version tests failed, exit non-zero
 $res
 
+# Bail out when --no-package given
+[ "$1" = "--no-package" ] && exit 0
+
 # Build the tarball
 script/package-tarball > package-tarball.txt
 cat package-tarball.txt

From 727767d0facf1d8cbef41db98afb281476563df4 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 30 Mar 2015 18:58:31 -0400
Subject: [PATCH 064/288] Upload packages to wcat.io and quiet down package
 build output

---
 script/cibuild     | 41 +++++++++++++++++++++++++++++++++--------
 script/package-deb | 12 ++++++++----
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/script/cibuild b/script/cibuild
index f5aeb11ec..2f4741c3a 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -32,15 +32,40 @@ $res
 # Bail out when --no-package given
 [ "$1" = "--no-package" ] && exit 0
 
+# files we'll md5sum at the end
+pkg_files=
+
 # Build the tarball
-script/package-tarball > package-tarball.txt
-cat package-tarball.txt
-tarball=$(grep '^Package ' < package-tarball.txt | cut -f 2 -d ' ')
-curl -sT- https://wcat.io <"$tarball" || true
-
-# Build the deb packages
-if type debuild 1>/dev/null 2>&1; then
-    script/package-deb
+echo "Building tar.gz package ..."
+if script/package-tarball 1>package-tarball.txt 2>&1; then
+    pkg_files=$(grep '^Package ' < package-tarball.txt | cut -f 2 -d ' ')
 else
+    echo "Packaging tar.gz failed:"
+    cat package-tarball.txt | sed 's/^/    /' 1>&2
+    exit 1
+fi
+
+# Skip deb packaging if debuild not installed
+if ! type debuild 1>/dev/null 2>&1; then
     echo "debuild not installed, skipping deb packaging ..."
+    exit 0
 fi
+
+# Build the deb related packages
+echo "Building deb package ..."
+if script/package-deb 1>package-deb-out.txt 2>package-deb-err.txt; then
+    pkg_files="$pkg_files $(cat package-deb-out.txt)"
+else
+    echo "Package build failed:"
+    cat package-tarball.txt | sed 's/^/    /' 1>&2
+    exit 1
+fi
+
+# Publish package files on wcat.io
+echo "Uploading packages ..."
+for f in $pkg_files; do
+    printf "%-32s %-s\n" "$(curl -sT- https://wcat.io <"$f" || true)" "$f"
+done
+
+# Generate md5sums
+md5sum $pkg_files
diff --git a/script/package-deb b/script/package-deb
index f3190173c..6e3d9e829 100755
--- a/script/package-deb
+++ b/script/package-deb
@@ -15,13 +15,17 @@ PKG_NAME="${PKG_BASE}-${PKG_VERS}"
 PKG_HEAD="$(git rev-parse HEAD)"
 
 # Run git-archive to generate tarball
-echo "Creating ${PKG_NAME}.deb ..."
 rm -rf dist/debuild
+trap "rm -rf dist/debuild" EXIT
 mkdir -p dist/debuild
+
 distdir="$(pwd)/dist/debuild/$PKG_NAME"
 git clone -q . "$distdir"
-
 cd "$distdir"
 git checkout -q "$PKG_HEAD"
-debuild -uc -us
-find $(dirname $(pwd)) -ls
+
+debuild -uc -us 1>&2
+cd ..
+files=$(ls -1 *.deb *.tar.gz *.dsc *.changes)
+mv $files ../
+for f in $files; do echo "dist/$f"; done

From 3b75365596398adb33457635ceeddc7cf65c41ef Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Sat, 14 Mar 2015 04:38:39 -0400
Subject: [PATCH 065/288] ghe-backup-repositories-rsync includes netshard repo
 paths in patterns

---
 .../ghe-backup-repositories-rsync             | 82 ++++++++++++++++++-
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index ee8182b4c..47f5c34ed 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -119,6 +119,7 @@ echo 1>&3
 echo "* Transferring auxiliary files ..." 1>&3
 rsync_repository_data -z <<RULES
 - /__*__/
+
 + /*/
 + /*/*.git
 - /*/*.git/objects
@@ -126,6 +127,26 @@ rsync_repository_data -z <<RULES
 - /*/*.git/packed-refs
 - /*/*.git/logs
 + /*/*.git/**
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
+- /*/??/??/??/gist/*.git/objects
+- /*/??/??/??/gist/*.git/refs
+- /*/??/??/??/gist/*.git/packed-refs
+- /*/??/??/??/gist/*.git/logs
++ /*/??/??/??/gist/*.git/**
+
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
+- /*/nw/??/??/??/*/*.git/objects
+- /*/nw/??/??/??/*/*.git/refs
+- /*/nw/??/??/??/*/*.git/packed-refs
+- /*/nw/??/??/??/*/*.git/logs
++ /*/nw/??/??/??/*/*.git/**
 RULES
 
 # Sync packed refs files. This is performed before sync'ing loose refs since
@@ -134,9 +155,24 @@ echo 1>&3
 echo "* Transferring packed-refs files ..." 1>&3
 rsync_repository_data -z <<RULES
 - /__*__/
+
 + /*/
 + /*/*.git
 + /*/*.git/packed-refs
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
++ /*/??/??/??/gist/*.git/packed-refs
+
++ /*/nw/??/
++ /*/nw/??/??/
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
++ /*/nw/??/??/??/*/*.git/packed-refs
 RULES
 
 # Sync loose refs and reflogs. This must be performed before object data is
@@ -145,25 +181,65 @@ echo 1>&3
 echo "* Transferring refs and reflogs ..."  1>&3
 rsync_repository_data -z <<RULES
 - /__*__/
+
 + /*/
 + /*/*.git
 + /*/*.git/refs
 + /*/*.git/refs/**
 + /*/*.git/logs
 + /*/*.git/logs/**
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
++ /*/??/??/??/gist/*.git/refs
++ /*/??/??/??/gist/*.git/refs/**
++ /*/??/??/??/gist/*.git/logs
++ /*/??/??/??/gist/*.git/logs/**
+
++ /*/nw/??/
++ /*/nw/??/??/
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
++ /*/nw/??/??/??/*/*.git/refs
++ /*/nw/??/??/??/*/*.git/refs/**
++ /*/nw/??/??/??/*/*.git/logs
++ /*/nw/??/??/??/*/*.git/logs/**
 RULES
 
-# Sync git objects and pack files. Compressing is disabled during this phase
+# Sync git objects and pack files. Compression is disabled during this phase
 # since these files are already well compressed.
 echo 1>&3
 echo "* Transferring objects and packs ..." 1>&3
 rsync_repository_data -H <<RULES
 - /__*__/
+
 + /*/
 + /*/*.git
 + /*/*.git/objects
-- tmp_*
+- /*/*.git/objects/**/tmp_*
 + /*/*.git/objects/**
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
++ /*/??/??/??/gist/*.git/objects
+- /*/??/??/??/gist/*.git/objects/**/tmp_*
++ /*/??/??/??/gist/*.git/objects/**
+
++ /*/nw/??/
++ /*/nw/??/??/
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
++ /*/nw/??/??/??/*/*.git/objects
+- /*/nw/??/??/??/*/*.git/objects/**/tmp_*
++ /*/nw/??/??/??/*/*.git/objects/**
 RULES
 
 # Sync __special__ data directories, including the __alambic_assets__,
@@ -182,5 +258,7 @@ rsync_repository_data <<RULES
 - /__render__/
 + /__*__/
 + /__*__/**
++ /info/
++ /info/*
 RULES
 echo 1>&3

From c9d54285c8d4ad18b604a71219cf37a7574c4f8c Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 30 Mar 2015 19:18:06 -0400
Subject: [PATCH 066/288] Exclude garbage in info/lost+found

---
 share/github-backup-utils/ghe-backup-repositories-rsync | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 47f5c34ed..be94160bb 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -119,6 +119,7 @@ echo 1>&3
 echo "* Transferring auxiliary files ..." 1>&3
 rsync_repository_data -z <<RULES
 - /__*__/
+- /info/
 
 + /*/
 + /*/*.git
@@ -155,6 +156,7 @@ echo 1>&3
 echo "* Transferring packed-refs files ..." 1>&3
 rsync_repository_data -z <<RULES
 - /__*__/
+- /info/
 
 + /*/
 + /*/*.git
@@ -181,6 +183,7 @@ echo 1>&3
 echo "* Transferring refs and reflogs ..."  1>&3
 rsync_repository_data -z <<RULES
 - /__*__/
+- /info/
 
 + /*/
 + /*/*.git
@@ -216,6 +219,7 @@ echo 1>&3
 echo "* Transferring objects and packs ..." 1>&3
 rsync_repository_data -H <<RULES
 - /__*__/
+- /info/
 
 + /*/
 + /*/*.git
@@ -259,6 +263,7 @@ rsync_repository_data <<RULES
 + /__*__/
 + /__*__/**
 + /info/
+- /info/lost+found/
 + /info/*
 RULES
 echo 1>&3

From f7b5fdab77313a1cc854c89ddec3cb45acaeeddc Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 30 Mar 2015 19:28:21 -0400
Subject: [PATCH 067/288] Run tests with 2.2.0 remote version

---
 script/cibuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/cibuild b/script/cibuild
index 2f4741c3a..553a8d035 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -9,6 +9,7 @@ set -e
 REMOTE_VERSIONS="
   11.10.344
   2.0.0
+  2.2.0
 "
 
 # Enable verbose logging of ssh commands

From 0e61eeb516ea45f4593810c0342abd87caf9c7ea Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 30 Mar 2015 19:44:36 -0400
Subject: [PATCH 068/288] Test that net-shard fs layout paths are backed up

---
 test/test-ghe-backup-repositories-rsync-nw.sh | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 test/test-ghe-backup-repositories-rsync-nw.sh

diff --git a/test/test-ghe-backup-repositories-rsync-nw.sh b/test/test-ghe-backup-repositories-rsync-nw.sh
new file mode 100644
index 000000000..6ba04718b
--- /dev/null
+++ b/test/test-ghe-backup-repositories-rsync-nw.sh
@@ -0,0 +1,132 @@
+#!/bin/sh
+# ghe-backup-repositories-rsync-nw command tests
+# uses the net-shard filesystem layout
+
+# Bring in testlib
+. $(dirname "$0")/testlib.sh
+
+# Create the backup data dir and fake remote repositories dirs
+mkdir -p "$GHE_DATA_DIR" "$GHE_REMOTE_DATA_USER_DIR/repositories"
+mkdir -p "$TRASHDIR/hooks"
+
+# Run under the remote repositories directory
+cd "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
+# Create some test repositories in the remote repositories dir
+
+repo1="0/nw/01/aa/3f/1234/1234.git"
+repo2="0/nw/01/aa/3f/1234/1235.git"
+repo3="1/nw/23/bb/4c/2345/2345.git"
+mkdir -p "$repo1" "$repo2" "$repo3"
+
+wiki1="0/nw/01/aa/3f/1234/1234.wiki.git"
+mkdir -p "$wiki1"
+
+gist1="0/01/aa/3f/gist/93069ad4c391b6203f183e147d52a97a.git"
+gist2="1/23/bb/4c/gist/1234.git"
+mkdir -p "$gist1" "$gist2"
+
+# Initialize test repositories with a fake commit
+for repo in $(find . -type d -name '*.git' -prune); do
+    git init -q --bare "$repo"
+    git --git-dir="$repo" --work-tree=. commit -q --allow-empty -m 'test commit'
+    rm -rf "$repo/hooks"
+    ln -s "$TRASHDIR/hooks" "$repo/hooks"
+done
+
+# Generate a packed-refs file in repo1
+git --git-dir="$repo1" pack-refs
+
+# Generate a pack in repo2
+git --git-dir="$repo2" repack -q
+
+# Add some fake svn data to repo3
+echo "fake svn history data" > "$repo3/svn.history.msgpack"
+mkdir "$repo3/svn_data"
+echo "fake property history data" > "$repo3/svn_data/property_history.msgpack"
+
+# Touch the info/nw-layout file, marking this as a net-shard fs
+mkdir -p "info"
+date "+%s" > info/nw-layout
+
+begin_test "ghe-backup-repositories-rsync first snapshot (nw)"
+(
+    set -e
+
+    # force snapshot number instead of generating a timestamp
+    GHE_SNAPSHOT_TIMESTAMP=1
+    export GHE_SNAPSHOT_TIMESTAMP
+
+    # run it
+    ghe-backup-repositories-rsync
+
+    # check that repositories directory was created
+    [ -d "$GHE_DATA_DIR/1/repositories" ]
+
+    # check that packed-refs file was transferred
+    [ -f "$GHE_DATA_DIR/1/repositories/$repo1/packed-refs" ]
+
+    # check that a pack file was transferred
+    [ -f "$GHE_DATA_DIR"/1/repositories/$repo2/objects/pack/*.pack ]
+
+    # check that svn data was transferred
+    [ -f "$GHE_DATA_DIR"/1/repositories/$repo3/svn.history.msgpack ]
+    [ -f "$GHE_DATA_DIR"/1/repositories/$repo3/svn_data/property_history.msgpack ]
+
+    # verify all repository data was transferred
+    diff -ru "$GHE_REMOTE_DATA_USER_DIR/repositories" "$GHE_DATA_DIR/1/repositories"
+)
+end_test
+
+
+begin_test "ghe-backup-repositories-rsync subsequent snapshot (nw)"
+(
+    set -e
+
+    # force snapshot number instead of generating a timestamp
+    GHE_SNAPSHOT_TIMESTAMP=2
+    export GHE_SNAPSHOT_TIMESTAMP
+
+    # make current symlink point to previous increment
+    ln -s 1 "$GHE_DATA_DIR/current"
+
+    # run it
+    ghe-backup-repositories-rsync
+
+    # check that repositories directory was created
+    snapshot="$GHE_DATA_DIR/2/repositories"
+    [ -d "$snapshot" ]
+
+    # verify hard links used for existing files
+    inode1=$(ls -i "$GHE_DATA_DIR/1/repositories/$repo1/packed-refs" | awk '{ print $1; }')
+    inode2=$(ls -i "$GHE_DATA_DIR/2/repositories/$repo1/packed-refs" | awk '{ print $1; }')
+    [ "$inode1" = "$inode2" ]
+
+    # verify all repository data exists in the increment
+    diff -ru "$GHE_REMOTE_DATA_USER_DIR/repositories" "$GHE_DATA_DIR/2/repositories"
+)
+end_test
+
+
+begin_test "ghe-backup-repositories-rsync temp files (nw)"
+(
+    set -e
+
+    # force snapshot number instead of generating a timestamp
+    GHE_SNAPSHOT_TIMESTAMP=4
+    export GHE_SNAPSHOT_TIMESTAMP
+
+    # create a tmp pack to emulate a pack being written to
+    touch "$GHE_REMOTE_DATA_USER_DIR/repositories/$repo1/objects/pack/tmp_pack_1234"
+
+    # run it
+    ghe-backup-repositories-rsync
+
+    # check that repositories directory was created
+    snapshot="$GHE_DATA_DIR/4/repositories"
+    [ -d "$snapshot" ]
+
+    # check that tmp pack was not transferred
+    [ ! -d "$snapshot/$repo1/objects/pack/tmp_pack_1234" ]
+)
+end_test

From 2423852470caab3e1e2a93a82dd27a04b27a2dd4 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 20 Apr 2015 13:52:46 -0400
Subject: [PATCH 069/288] Fix ghe-backup-settings failure due to new license
 file perms

The license file is now 0400 and owned by the 'git' user.
---
 share/github-backup-utils/ghe-backup-settings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index 87c9c1d76..1b4e145d2 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -21,7 +21,7 @@ echo "* Transferring settings data ..." 1>&3
 ghe-ssh "$host" -- 'ghe-export-settings' > settings.json
 
 echo "* Transferring license data ..." 1>&3
-ghe-ssh "$host" -- "cat '$GHE_REMOTE_LICENSE_FILE'" > enterprise.ghl
+ghe-ssh "$host" -- "sudo cat '$GHE_REMOTE_LICENSE_FILE'" > enterprise.ghl
 
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "* Transferring management console password ..." 1>&3

From f1dc27cf73479e1420e3dccb798f7b2c57e5ae36 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 20 Apr 2015 14:22:16 -0400
Subject: [PATCH 070/288] Fix ghe-backup-redis failure due to new rdb file
 perms

The rdb file is now 0700 and owned by the redis user.
---
 share/github-backup-utils/ghe-backup-redis | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-redis b/share/github-backup-utils/ghe-backup-redis
index 10ea8bde6..ff13d7c5d 100755
--- a/share/github-backup-utils/ghe-backup-redis
+++ b/share/github-backup-utils/ghe-backup-redis
@@ -23,5 +23,5 @@ ghe-ssh "$GHE_HOSTNAME" /bin/sh <<EOF
     while [ \$(redis-cli LASTSAVE) -eq \$timestamp ]; do
         sleep 1
     done
-    cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'
+    sudo cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'
 EOF

From 2db6e90192b47c2a04080457b345ced76fe91cea Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Mon, 20 Apr 2015 15:03:15 -0400
Subject: [PATCH 071/288] Only sudo under GHE >= 2.x

---
 share/github-backup-utils/ghe-backup-redis    | 4 +++-
 share/github-backup-utils/ghe-backup-settings | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-redis b/share/github-backup-utils/ghe-backup-redis
index ff13d7c5d..dbd1e796f 100755
--- a/share/github-backup-utils/ghe-backup-redis
+++ b/share/github-backup-utils/ghe-backup-redis
@@ -16,6 +16,8 @@ cd $(dirname "$0")/../..
 ghe_remote_version_required "$GHE_HOSTNAME"
 
 # Force a redis BGSAVE, and wait for it to complete.
+sudo=
+[ "$GHE_VERSION_MAJOR" -ge 2 ] && sudo="sudo"
 ghe-ssh "$GHE_HOSTNAME" /bin/sh <<EOF
     set -e
     timestamp=\$(redis-cli LASTSAVE)
@@ -23,5 +25,5 @@ ghe-ssh "$GHE_HOSTNAME" /bin/sh <<EOF
     while [ \$(redis-cli LASTSAVE) -eq \$timestamp ]; do
         sleep 1
     done
-    sudo cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'
+    $sudo cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'
 EOF
diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index 1b4e145d2..4d618c12a 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -21,7 +21,9 @@ echo "* Transferring settings data ..." 1>&3
 ghe-ssh "$host" -- 'ghe-export-settings' > settings.json
 
 echo "* Transferring license data ..." 1>&3
-ghe-ssh "$host" -- "sudo cat '$GHE_REMOTE_LICENSE_FILE'" > enterprise.ghl
+comm="cat '$GHE_REMOTE_LICENSE_FILE'"
+[ "$GHE_VERSION_MAJOR" -ge 2 ] && comm="sudo $comm"
+ghe-ssh "$host" -- "$comm" > enterprise.ghl
 
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "* Transferring management console password ..." 1>&3

From 4783ba7bf62dd2defb6058623766dedb837c93f4 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Tue, 28 Apr 2015 10:09:54 -0400
Subject: [PATCH 072/288] 2.2.0 release

---
 share/github-backup-utils/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index e9307ca57..ccbccc3dc 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.0.2
+2.2.0

From b9c5e233dd3b92bce519c67096868b3d49b50f05 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Wed, 29 Apr 2015 03:41:11 -0400
Subject: [PATCH 073/288] Update changelog

---
 debian/changelog | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d755f0899..537d66986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+github-backup-utils (2.2.0) UNRELEASED; urgency=medium
+
+  * Adds support for the new repositories filesystem layout include in
+    GitHub Enterprise v2.2. #122, #124
+  * ghe-restore now performs a config run on the instance after an incremental
+    restore to 11.10.x and 2.x instances. #100
+  * ghe-restore now fails fast when run against a GHE instance with replication
+    enabled. Replication should be disabled during a restore and then setup
+    after the restore completes. #121
+  * Fixes an issue with special port 122 detection failing when port is
+    overridden in an ssh config file. #102
+  * Removes a warning message when running ghe-backup against an instance with
+    GitHub Pages disabled. #117
+  * backup-utils release version numbers now track GitHub Enterprise releases
+    to ease the process of determining which version of backup-utils is
+    required for a given GitHub Enterprise version.
+
+ -- Ryan Tomayko <ryan@github.com>  Wed, 29 Apr 2015 07:29:04 +0000
+
 github-backup-utils (2.0.2) UNRELEASED; urgency=medium
 
   * ghe-restore now requires that an already-configured appliance be put into

From 5e031c3688f9dc2ed34fc59127e9d16fcdedce48 Mon Sep 17 00:00:00 2001
From: Derek Sorkin <sorkin@github.com>
Date: Mon, 4 May 2015 12:08:32 -0700
Subject: [PATCH 074/288] update migration link in readme - fixes #125

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7c702f69d..6859addcc 100644
--- a/README.md
+++ b/README.md
@@ -242,5 +242,5 @@ site setup or recovery, please contact our [Enterprise support team][7] instead.
 [7]: https://enterprise.github.com/support/
 [8]: https://enterprise.github.com/help/articles/backing-up-enterprise-data
 [9]: https://enterprise.github.com/help/articles/restoring-enterprise-data
-[10]: https://help.github.com/enterprise/2.0/admin-guide/migrating/
+[10]: https://help.github.com/enterprise/2.0/admin-guide/migrating-to-a-different-platform-or-from-github-enterprise-11-10-34x/
 [11]: https://help.github.com/enterprise/2.0/admin-guide/

From b4b8bdb85c2beb8f3f37c2c8340b4cd63e272dbe Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <rtomayko@gmail.com>
Date: Mon, 11 May 2015 09:47:04 -0400
Subject: [PATCH 075/288] Clarify behavior of ghe-restore -c on already
 configured instances

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a78ed365b..92a51b188 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,10 @@ The `ghe-backup` and `ghe-restore` commands also have a verbose output mode
 (`-v`) that lists files as they're being transferred. It's often useful to
 enable when output is logged to a file.
 
-The settings and license are not restored by default to prevent overwriting different configuration on the restore host. Restore appliance settings and license in addition to datastores by passing the `-c` argument to `ghe-restore`
+When restoring to an already configured GHE instance, settings and license data
+are *not* restored to prevent overwriting manual configuration on the restore
+host. This behavior can be overriden by passing the `-c` argument to `ghe-restore`,
+forcing settings and license data to be overwritten with the backup copy's data.
 
 ### Scheduling backups
 

From e5d57347d3ac63c61fd977ab3c6340122d806dcf Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Wed, 13 May 2015 18:03:42 +0100
Subject: [PATCH 076/288] Remove temp 2.2 migration dir before restoring repos

---
 bin/ghe-restore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 4ac6691fc..e0f01415d 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -178,6 +178,9 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
 fi
 
 echo "Restoring Git repositories ..."
+# Remove temporary 2.2 storage migration directory if it exists
+echo "[ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
+ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
 ghe-restore-repositories-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 
 echo "Restoring GitHub Pages ..."

From e8148e39f2975b5503812a6bf39c1701d51550fd Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Wed, 13 May 2015 18:18:47 +0100
Subject: [PATCH 077/288] Fix silly syntax error

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index e0f01415d..8550f39a7 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -179,7 +179,7 @@ fi
 
 echo "Restoring Git repositories ..."
 # Remove temporary 2.2 storage migration directory if it exists
-echo "[ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
+echo "if [ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
 ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
 ghe-restore-repositories-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 

From 775fc5e1216a47266e8b1c0cf0ab0bbe9e449d0b Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 14 May 2015 09:20:17 -0400
Subject: [PATCH 078/288] Move repositories-nw-backup removal around a bit

---
 bin/ghe-restore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 8550f39a7..d58c73a1b 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -177,10 +177,11 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
 fi
 
-echo "Restoring Git repositories ..."
 # Remove temporary 2.2 storage migration directory if it exists
 echo "if [ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
 ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
+
+echo "Restoring Git repositories ..."
 ghe-restore-repositories-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 
 echo "Restoring GitHub Pages ..."

From e5bfddf7af5da42d29ac56bd638b00a503e00d38 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 14 May 2015 09:22:47 -0400
Subject: [PATCH 079/288] Restart stale memcached after restore

---
 bin/ghe-restore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index d58c73a1b..5bed72034 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -207,6 +207,11 @@ ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT
 echo "Restoring Elasticsearch indices ..."
 ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 
+# Restart an already running memcached to reset the cache after restore
+if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo restart -q memcached 2>&1 || true"
+fi
+
 # When restoring to a host that has already been configured, kick off a
 # config run to perform data migrations.
 if $instance_configured; then

From bd61d55202788785665c2c31ebdf460af9f36371 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 14 May 2015 09:28:09 -0400
Subject: [PATCH 080/288] Use complex command form

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 5bed72034..8a412034b 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -209,7 +209,7 @@ ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 
 # Restart an already running memcached to reset the cache after restore
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    ghe-ssh "$GHE_HOSTNAME" -- "sudo restart -q memcached 2>&1 || true"
+    echo "sudo restart -q memcached 2>&1 || true" | ghe-ssh "$GHE_HOSTNAME"
 fi
 
 # When restoring to a host that has already been configured, kick off a

From 70af02b1c1f7d9de5bf7b44fbf84b4b5d325b3e3 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 14 May 2015 09:32:54 -0400
Subject: [PATCH 081/288] Debug logging of memcached restart

---
 bin/ghe-restore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 8a412034b..ee72224a1 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -209,7 +209,9 @@ ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 
 # Restart an already running memcached to reset the cache after restore
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    echo "sudo restart -q memcached 2>&1 || true" | ghe-ssh "$GHE_HOSTNAME"
+    echo "Restarting memcached ..." 1>&3
+    echo "sudo restart -q memcached 2>/dev/null || true" |
+        ghe-ssh "$GHE_HOSTNAME" -- /bin/sh
 fi
 
 # When restoring to a host that has already been configured, kick off a

From 1d7d24101d986ce1910c9330adff7142e003776e Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 21 May 2015 07:35:56 -0400
Subject: [PATCH 082/288] ghe_remote_logger logs to syslog on remote instance

---
 share/github-backup-utils/ghe-backup-config | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 969f1155d..312acc6a4 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -233,3 +233,15 @@ ssh_host_part () {
 ssh_port_part () {
     [ "${1##*:}" = "$1" ] && echo 22 || echo "${1##*:}"
 }
+
+# Usage: ghe_remote_logger <message>...
+# Log a message to /var/log/syslog on the remote instance.
+# Note: Use sparingly. Remote logging requires an ssh connection per invocation.
+ghe_remote_logger () {
+    if [ "$GHE_VERSION_MAJOR" -lt 2 ]; then
+        return 0
+    fi
+
+    echo "$@" |
+    ghe-ssh "$GHE_HOSTNAME" -- logger -t backup-utils
+}

From 0d4694ef5efd598fae9d80dd46c387cf68466938 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 21 May 2015 07:44:52 -0400
Subject: [PATCH 083/288] Log ghe-backup start/complete on remote instance

---
 bin/ghe-backup | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index bc94bc2b6..778372f0d 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -67,6 +67,9 @@ echo "Starting backup of $GHE_HOSTNAME in snapshot $GHE_SNAPSHOT_TIMESTAMP"
 ghe_remote_version_required
 echo "$GHE_REMOTE_VERSION" > version
 
+# Log backup start message in /var/log/syslog on remote instance
+ghe_remote_logger "Starting backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP"
+
 # Determine whether to use the rsync or tarball backup strategy based on the
 # remote appliance version. The tarball strategy must be used with GitHub
 # Enterprise versions prior to 11.10.340 since rsync is not available.
@@ -153,8 +156,11 @@ fi
 echo "Completed backup of $GHE_HOSTNAME in snapshot $GHE_SNAPSHOT_TIMESTAMP at $(date +"%H:%M:%S")"
 
 # Exit non-zero and list the steps that failed.
-if [ -n "$failures" ]; then
+if [ -z "$failures" ]; then
+    ghe_remote_logger "Completed backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP successfully."
+else
     steps="$(echo $failures | sed 's/ /, /g')"
+    ghe_remote_logger "Completed backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP with failures: ${steps}."
     echo "Error: Snapshot incomplete. Some steps failed: ${steps}. "
     exit 1
 fi

From 13af9523784f632e7c86374330845ee2329e71da Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 21 May 2015 07:51:25 -0400
Subject: [PATCH 084/288] Log ghe-restore start/complete on remote instance

---
 bin/ghe-restore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index ee72224a1..244112158 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -133,7 +133,11 @@ if $instance_configured && ! $force; then
     echo
 fi
 
+# Log restore start message locally and in /var/log/syslog on remote instance
 echo "Starting restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
+ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
+
+# Update remote restore state file and setup failure trap
 trap "update_restore_status failed" EXIT
 update_restore_status "restoring"
 
@@ -232,6 +236,9 @@ fi
 trap "" EXIT
 update_restore_status "complete"
 
+# Log restore complete message in /var/log/syslog on remote instance
+ghe_remote_logger "Completed restore from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
+
 echo "Restoring SSH host keys ..."
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
 

From 7a3d1d9fc6fa0c52eeb881d4e103444c8be9e603 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 21 May 2015 08:05:17 -0400
Subject: [PATCH 085/288] More consistent remote log messages

---
 bin/ghe-backup  | 2 +-
 bin/ghe-restore | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 778372f0d..f1323518d 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -68,7 +68,7 @@ ghe_remote_version_required
 echo "$GHE_REMOTE_VERSION" > version
 
 # Log backup start message in /var/log/syslog on remote instance
-ghe_remote_logger "Starting backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP"
+ghe_remote_logger "Starting backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
 
 # Determine whether to use the rsync or tarball backup strategy based on the
 # remote appliance version. The tarball strategy must be used with GitHub
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 244112158..4f80b5c46 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -237,7 +237,7 @@ trap "" EXIT
 update_restore_status "complete"
 
 # Log restore complete message in /var/log/syslog on remote instance
-ghe_remote_logger "Completed restore from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
+ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_SNAPSHOT_TIMESTAMP}."
 
 echo "Restoring SSH host keys ..."
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3

From 170d26c352c9038cb60975a67493f1ccc4d244f3 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 21 May 2015 08:05:29 -0400
Subject: [PATCH 086/288] Remote logging failure does not cause process exit

---
 share/github-backup-utils/ghe-backup-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 312acc6a4..3c9bf7246 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -243,5 +243,5 @@ ghe_remote_logger () {
     fi
 
     echo "$@" |
-    ghe-ssh "$GHE_HOSTNAME" -- logger -t backup-utils
+    ghe-ssh "$GHE_HOSTNAME" -- logger -t backup-utils || true
 }

From c58de4a22f30ba0a5fa1f49645df62e0b5e659f1 Mon Sep 17 00:00:00 2001
From: Ryan Tomayko <ryan@github.com>
Date: Thu, 21 May 2015 08:07:23 -0400
Subject: [PATCH 087/288] Remove >= GHE 2.x requirement

Verified logger(1) works as intended on 11.10.34x as well so we
should be fine here.
---
 share/github-backup-utils/ghe-backup-config | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 3c9bf7246..cbe0051eb 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -238,10 +238,6 @@ ssh_port_part () {
 # Log a message to /var/log/syslog on the remote instance.
 # Note: Use sparingly. Remote logging requires an ssh connection per invocation.
 ghe_remote_logger () {
-    if [ "$GHE_VERSION_MAJOR" -lt 2 ]; then
-        return 0
-    fi
-
     echo "$@" |
     ghe-ssh "$GHE_HOSTNAME" -- logger -t backup-utils || true
 }

From 0efa80361b76ca9e6464f96b1117d2d5d5c27b4c Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Mon, 29 Jun 2015 12:02:21 -0700
Subject: [PATCH 088/288] remove hookshot backup/restore

---
 bin/ghe-backup                                |  4 ----
 bin/ghe-restore                               |  3 ---
 .../ghe-backup-repositories-rsync             |  5 +++--
 share/github-backup-utils/ghe-backup-userdata |  2 +-
 .../github-backup-utils/ghe-restore-userdata  |  2 +-
 test/test-ghe-backup.sh                       | 14 -------------
 test/test-ghe-restore.sh                      | 20 -------------------
 7 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index f1323518d..244007f90 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -123,10 +123,6 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "Backing up asset attachments ..."
     ghe-backup-userdata alambic_assets ||
     failures="$failures alambic_assets"
-
-    echo "Backing up hook deliveries ..."
-    ghe-backup-userdata hookshot ||
-    failures="$failures hookshot"
 fi
 
 echo "Backing up Elasticsearch indices ..."
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 4f80b5c46..4fdef6130 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -194,9 +194,6 @@ ghe-restore-pages-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "Restoring asset attachments ..."
     ghe-restore-userdata alambic_assets "$GHE_HOSTNAME" 1>&3
-
-    echo "Restoring hook deliveries ..."
-    ghe-restore-userdata hookshot "$GHE_HOSTNAME" 1>&3
 fi
 
 echo "Restoring MySQL database ..."
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index be94160bb..203023081 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -247,9 +247,9 @@ rsync_repository_data -H <<RULES
 RULES
 
 # Sync __special__ data directories, including the __alambic_assets__,
-# __hookshot__, and __purgatory__ directories. The __nodeload_archives__,
+# and __purgatory__ directories. The __nodeload_archives__,
 # __gitmon__, and __render__ directories are excludes since they act only as
-# caches.
+# caches. The __hookshot__ directory is also excluded since it only contains log files.
 #
 # Under v2.x and greater, only the special __purgatory__ directory remains under
 # /data/repositories. All other special user data directories have been moved under
@@ -260,6 +260,7 @@ rsync_repository_data <<RULES
 - /__nodeload_archives__/
 - /__gitmon__/
 - /__render__/
+- /__hookshot__/
 + /__*__/
 + /__*__/**
 + /info/
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 187982511..b2466747c 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -2,7 +2,7 @@
 #/ Usage: ghe-backup-userdata <dirname>
 #/ Take an online, incremental snapshot of a user data directory. This is used
 #/ for a number of different simple datastores kept under /data/user on the
-#/ remote appliance, including: hookshot, alambic_assets, and pages data.
+#/ remote appliance, including alambic_assets and pages data.
 set -e
 
 # Bring in the backup configuration
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index 3ee5942fc..3c1f34424 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -2,7 +2,7 @@
 #/ Usage: ghe-restore-userdata <dirname> <host>
 #/ Restore a special user data directory via rsync. This is used
 #/ for a number of different simple datastores kept under /data/user on the
-#/ remote appliance, including: hookshot, alambic_assets, and pages data.
+#/ remote appliance, including alambic_assets and pages data.
 set -e
 
 # Bring in the backup configuration
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 2077a1e44..dc74232cb 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -17,14 +17,6 @@ touch alice/index.html bob/index.html
 mkdir -p "$GHE_REMOTE_DATA_USER_DIR/common"
 echo "fake password hash data" > "$GHE_REMOTE_DATA_USER_DIR/common/manage-password"
 
-# Create some fake hookshot data in the remote data directory
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/hookshot"
-    cd "$GHE_REMOTE_DATA_USER_DIR/hookshot"
-    mkdir -p repository-123 repository-456
-    touch repository-123/test.bpack repository-456/test.bpack
-fi
-
 # Create some fake alambic data in the remote data directory
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     mkdir -p "$GHE_REMOTE_DATA_USER_DIR/alambic_assets/github-enterprise-assets/0000"
@@ -117,9 +109,6 @@ begin_test "ghe-backup first snapshot"
     fi
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-        # verify all hookshot user data was transferred
-        diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
-
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi
@@ -189,9 +178,6 @@ begin_test "ghe-backup subsequent snapshot"
     fi
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-        # verify all hookshot user data was transferred
-        diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
-
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 5ca5e5f0f..2fbbcbc49 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -18,14 +18,6 @@ mkdir -p gh-enterprise-es/node/0
 touch gh-enterprise-es/node/0/stuff1
 touch gh-enterprise-es/node/0/stuff2
 
-# Create some fake hookshot data in the remote data directory
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    mkdir -p "$GHE_DATA_DIR/1/hookshot"
-    cd "$GHE_DATA_DIR/1/hookshot"
-    mkdir -p repository-123 repository-456
-    touch repository-123/test.bpack repository-456/test.bpack
-fi
-
 # Create some fake alambic data in the remote data directory
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     mkdir -p "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000"
@@ -115,9 +107,6 @@ begin_test "ghe-restore into configured vm"
     diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-        # verify all hookshot user data was transferred
-        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
-
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi
@@ -224,9 +213,6 @@ begin_test "ghe-restore -c into unconfigured vm"
     diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-        # verify all hookshot user data was transferred
-        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
-
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi
@@ -280,9 +266,6 @@ begin_test "ghe-restore into unconfigured vm"
         # verify all pages data was transferred to the restore location
         diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
-        # verify all hookshot user data was transferred
-        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
-
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
 
@@ -326,9 +309,6 @@ begin_test "ghe-restore with host arg"
     diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-        # verify all hookshot user data was transferred
-        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
-
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi

From b6a3ce3c27c47cf7f8c4819b9695c22bc322071f Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Tue, 4 Aug 2015 15:55:46 +0100
Subject: [PATCH 089/288] Revert "Remove hookshot backup/restore"

---
 bin/ghe-backup                                |  4 ++++
 bin/ghe-restore                               |  3 +++
 .../ghe-backup-repositories-rsync             |  5 ++---
 share/github-backup-utils/ghe-backup-userdata |  2 +-
 .../github-backup-utils/ghe-restore-userdata  |  2 +-
 test/test-ghe-backup.sh                       | 14 +++++++++++++
 test/test-ghe-restore.sh                      | 20 +++++++++++++++++++
 7 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 244007f90..f1323518d 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -123,6 +123,10 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "Backing up asset attachments ..."
     ghe-backup-userdata alambic_assets ||
     failures="$failures alambic_assets"
+
+    echo "Backing up hook deliveries ..."
+    ghe-backup-userdata hookshot ||
+    failures="$failures hookshot"
 fi
 
 echo "Backing up Elasticsearch indices ..."
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 4fdef6130..4f80b5c46 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -194,6 +194,9 @@ ghe-restore-pages-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "Restoring asset attachments ..."
     ghe-restore-userdata alambic_assets "$GHE_HOSTNAME" 1>&3
+
+    echo "Restoring hook deliveries ..."
+    ghe-restore-userdata hookshot "$GHE_HOSTNAME" 1>&3
 fi
 
 echo "Restoring MySQL database ..."
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 203023081..be94160bb 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -247,9 +247,9 @@ rsync_repository_data -H <<RULES
 RULES
 
 # Sync __special__ data directories, including the __alambic_assets__,
-# and __purgatory__ directories. The __nodeload_archives__,
+# __hookshot__, and __purgatory__ directories. The __nodeload_archives__,
 # __gitmon__, and __render__ directories are excludes since they act only as
-# caches. The __hookshot__ directory is also excluded since it only contains log files.
+# caches.
 #
 # Under v2.x and greater, only the special __purgatory__ directory remains under
 # /data/repositories. All other special user data directories have been moved under
@@ -260,7 +260,6 @@ rsync_repository_data <<RULES
 - /__nodeload_archives__/
 - /__gitmon__/
 - /__render__/
-- /__hookshot__/
 + /__*__/
 + /__*__/**
 + /info/
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index b2466747c..187982511 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -2,7 +2,7 @@
 #/ Usage: ghe-backup-userdata <dirname>
 #/ Take an online, incremental snapshot of a user data directory. This is used
 #/ for a number of different simple datastores kept under /data/user on the
-#/ remote appliance, including alambic_assets and pages data.
+#/ remote appliance, including: hookshot, alambic_assets, and pages data.
 set -e
 
 # Bring in the backup configuration
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index 3c1f34424..3ee5942fc 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -2,7 +2,7 @@
 #/ Usage: ghe-restore-userdata <dirname> <host>
 #/ Restore a special user data directory via rsync. This is used
 #/ for a number of different simple datastores kept under /data/user on the
-#/ remote appliance, including alambic_assets and pages data.
+#/ remote appliance, including: hookshot, alambic_assets, and pages data.
 set -e
 
 # Bring in the backup configuration
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index dc74232cb..2077a1e44 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -17,6 +17,14 @@ touch alice/index.html bob/index.html
 mkdir -p "$GHE_REMOTE_DATA_USER_DIR/common"
 echo "fake password hash data" > "$GHE_REMOTE_DATA_USER_DIR/common/manage-password"
 
+# Create some fake hookshot data in the remote data directory
+if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+    cd "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+    mkdir -p repository-123 repository-456
+    touch repository-123/test.bpack repository-456/test.bpack
+fi
+
 # Create some fake alambic data in the remote data directory
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     mkdir -p "$GHE_REMOTE_DATA_USER_DIR/alambic_assets/github-enterprise-assets/0000"
@@ -109,6 +117,9 @@ begin_test "ghe-backup first snapshot"
     fi
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi
@@ -178,6 +189,9 @@ begin_test "ghe-backup subsequent snapshot"
     fi
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 2fbbcbc49..5ca5e5f0f 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -18,6 +18,14 @@ mkdir -p gh-enterprise-es/node/0
 touch gh-enterprise-es/node/0/stuff1
 touch gh-enterprise-es/node/0/stuff2
 
+# Create some fake hookshot data in the remote data directory
+if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    mkdir -p "$GHE_DATA_DIR/1/hookshot"
+    cd "$GHE_DATA_DIR/1/hookshot"
+    mkdir -p repository-123 repository-456
+    touch repository-123/test.bpack repository-456/test.bpack
+fi
+
 # Create some fake alambic data in the remote data directory
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     mkdir -p "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000"
@@ -107,6 +115,9 @@ begin_test "ghe-restore into configured vm"
     diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi
@@ -213,6 +224,9 @@ begin_test "ghe-restore -c into unconfigured vm"
     diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi
@@ -266,6 +280,9 @@ begin_test "ghe-restore into unconfigured vm"
         # verify all pages data was transferred to the restore location
         diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
 
@@ -309,6 +326,9 @@ begin_test "ghe-restore with host arg"
     diff -ru "$GHE_DATA_DIR/current/pages" "$GHE_REMOTE_DATA_USER_DIR/pages"
 
     if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi

From ecb5d0b4d5e1ba2093f5d118090369d6546b9fbe Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Thu, 6 Aug 2015 18:55:22 +0100
Subject: [PATCH 090/288] Only use --link-dest when backing up populated
 directories

---
 share/github-backup-utils/ghe-backup-userdata | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index b2466747c..ba4efd491 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -26,9 +26,9 @@ ghe_remote_version_required "$host"
 # to an older version of GHE or no data has been added to this directory yet.
 ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/$dirname' ]" || exit 0
 
-# If we have a previous increment, avoid transferring existing files via rsync's
+# If we have a previous increment and it is not empty, avoid transferring existing files via rsync's
 # --link-dest support. This also decreases physical space usage considerably.
-if [ -d "$GHE_DATA_DIR/current/$dirname" ]; then
+if [ -d "$GHE_DATA_DIR/current/$dirname" ] && [ "$(ls -A $GHE_DATA_DIR/current/$dirname)" ]; then
     link_dest="--link-dest=../../current/$dirname"
 fi
 

From ee189ce50c23acf1a3c7315a0d83635e2703e2de Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Thu, 6 Aug 2015 18:55:22 +0100
Subject: [PATCH 091/288] Only use --link-dest when backing up populated
 directories

---
 share/github-backup-utils/ghe-backup-userdata | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 187982511..2c39a9827 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -26,9 +26,9 @@ ghe_remote_version_required "$host"
 # to an older version of GHE or no data has been added to this directory yet.
 ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/$dirname' ]" || exit 0
 
-# If we have a previous increment, avoid transferring existing files via rsync's
+# If we have a previous increment and it is not empty, avoid transferring existing files via rsync's
 # --link-dest support. This also decreases physical space usage considerably.
-if [ -d "$GHE_DATA_DIR/current/$dirname" ]; then
+if [ -d "$GHE_DATA_DIR/current/$dirname" ] && [ "$(ls -A $GHE_DATA_DIR/current/$dirname)" ]; then
     link_dest="--link-dest=../../current/$dirname"
 fi
 

From 4caccda2e349e23d97ba7c016af9cc7c010c209d Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Fri, 7 Aug 2015 15:13:36 +0100
Subject: [PATCH 092/288] Added a test for --link-dest warning

---
 test/test-ghe-backup.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 2077a1e44..bc961a778 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -251,3 +251,16 @@ begin_test "ghe-backup without manage-password file"
     [ ! -f "$GHE_DATA_DIR/current/manage-password" ]
 )
 end_test
+
+begin_test "ghe-backup emtpy hookshot directory"
+(
+  set -e
+
+  rm -rf $GHE_REMOTE_DATA_USER_DIR/hookshot/repository-*
+  rm -rf $GHE_DATA_DIR/current/hookshot/repository-*
+  ghe-backup
+
+  # Check that the "--link-dest arg does not exist" message hasn't occurred.
+  [ ! "$(grep "[l]ink-dest arg does not exist" $TRASHDIR/out)" ]
+)
+end_test

From 94ebad85a5783babb35b0051df7b351500f92b39 Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Fri, 28 Aug 2015 08:56:13 -0600
Subject: [PATCH 093/288] how it differs from HA instance

A customer asked why they needed to use the backup-utils utility while we were onsite last week. Their assumption was that because all data is replicated to the High Availability instance the duplication of this data in the form of the backup-utils utility was unnecessary. I wanted to define the separate use cases here so we could point customers to it.
---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 2e8470f33..940e94fc5 100644
--- a/README.md
+++ b/README.md
@@ -231,6 +231,13 @@ most recent successful snapshot:
 Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
+### How does this backup data differ from the HA (High Availability) backup data?
+These two backups serve different purposes. The [HA backup](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a backup instance that is ready in case the primary instance becomes unavailable. The HA backup pulls data from the primary instance to ensure it is up to date in case it needs to be promoted to the primary instance. In that sense the HA backup has all the data and configuration of the primary instance.
+
+The backup-utils data is meant to be used to restore an istance or set up a new instance. This backup data is more lightweight than having a replica instance. It does not require the overhead of having a VM that can support running GitHub Enterprise. The backup-utils utility only copies over repository data, along with full snapshots of all other pertinent data stores. and formats this data so it can be reused in the restoration or setup of an instance. 
+
+As an example, if a company wanted to create a QA server to test upgrading GitHub Enterprise they could use the backup-utils utility to populate the QA server with data and settings from a snapshot and be up and running in a few minutes. The process is more complex to setup an HA instance and do the conversion after a data set has been copied over. The latter use case is not recommended. 
+
 ### Support
 
 If you find a bug or would like to request a feature in backup-utils, please

From 2592c8e4eb3e93f3cc7ad4c1d1886fca491a34cb Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Fri, 28 Aug 2015 09:02:09 -0600
Subject: [PATCH 094/288] clarified HA data is not usable without backup-utils

Made the clarification that the backup-utils data is made to populate other instances with data. This is not the purpose of the HA data and in order to transfer that data to another instance you would need to use backup-utils. Other ways are possible but not recommended.
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 940e94fc5..cfdcc55b3 100644
--- a/README.md
+++ b/README.md
@@ -231,12 +231,12 @@ most recent successful snapshot:
 Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
-### How does this backup data differ from the HA (High Availability) backup data?
-These two backups serve different purposes. The [HA backup](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a backup instance that is ready in case the primary instance becomes unavailable. The HA backup pulls data from the primary instance to ensure it is up to date in case it needs to be promoted to the primary instance. In that sense the HA backup has all the data and configuration of the primary instance.
+### How does this data differ from the HA (High Availability) backup data?
+These two backups serve different purposes. The [HA backup](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a backup instance that is ready in case the primary instance becomes unavailable. The HA backup pulls data from the primary instance to ensure it is up to date in case it needs to be promoted to the primary instance. In that sense the HA backup has all the data and configuration of the primary instance. This data on the HA instance is not usable by other instances without being extracted by the backup-utils.
 
-The backup-utils data is meant to be used to restore an istance or set up a new instance. This backup data is more lightweight than having a replica instance. It does not require the overhead of having a VM that can support running GitHub Enterprise. The backup-utils utility only copies over repository data, along with full snapshots of all other pertinent data stores. and formats this data so it can be reused in the restoration or setup of an instance. 
+The backup-utils data is meant to be used to restore an instance or set up a new instance. This backup data does not require the overhead of having a VM that can support running GitHub Enterprise. The backup-utils utility only copies over repository data, along with full snapshots of all other pertinent data stores. and formats this data so it can be reused in the restoration or setup of an instance. 
 
-As an example, if a company wanted to create a QA server to test upgrading GitHub Enterprise they could use the backup-utils utility to populate the QA server with data and settings from a snapshot and be up and running in a few minutes. The process is more complex to setup an HA instance and do the conversion after a data set has been copied over. The latter use case is not recommended. 
+As an example, if a company wanted to create a QA server to test upgrading GitHub Enterprise they could use the backup-utils utility to populate the QA server with data and settings from a snapshot and be up and running in a very short amount of time. The process is more complex to setup an HA instance and do the conversion after a data set has been copied over. The latter use case is not recommended. 
 
 ### Support
 

From 2b996928b97aac619c037fb2c922659537c775ba Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Fri, 28 Aug 2015 09:03:44 -0600
Subject: [PATCH 095/288] testing H5 headers to make it more readable

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index cfdcc55b3..27b12bf5b 100644
--- a/README.md
+++ b/README.md
@@ -232,8 +232,10 @@ Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
 ### How does this data differ from the HA (High Availability) backup data?
+##### The purpose of High Avaibility backup
 These two backups serve different purposes. The [HA backup](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a backup instance that is ready in case the primary instance becomes unavailable. The HA backup pulls data from the primary instance to ensure it is up to date in case it needs to be promoted to the primary instance. In that sense the HA backup has all the data and configuration of the primary instance. This data on the HA instance is not usable by other instances without being extracted by the backup-utils.
 
+##### The purpose of the backup-utils
 The backup-utils data is meant to be used to restore an instance or set up a new instance. This backup data does not require the overhead of having a VM that can support running GitHub Enterprise. The backup-utils utility only copies over repository data, along with full snapshots of all other pertinent data stores. and formats this data so it can be reused in the restoration or setup of an instance. 
 
 As an example, if a company wanted to create a QA server to test upgrading GitHub Enterprise they could use the backup-utils utility to populate the QA server with data and settings from a snapshot and be up and running in a very short amount of time. The process is more complex to setup an HA instance and do the conversion after a data set has been copied over. The latter use case is not recommended. 

From eb465c5ef819b22bb505179723b8b38a12d86446 Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Fri, 28 Aug 2015 09:04:12 -0600
Subject: [PATCH 096/288] fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27b12bf5b..0055bd26b 100644
--- a/README.md
+++ b/README.md
@@ -232,7 +232,7 @@ Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
 ### How does this data differ from the HA (High Availability) backup data?
-##### The purpose of High Avaibility backup
+##### The purpose of the High Avaibility backup
 These two backups serve different purposes. The [HA backup](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a backup instance that is ready in case the primary instance becomes unavailable. The HA backup pulls data from the primary instance to ensure it is up to date in case it needs to be promoted to the primary instance. In that sense the HA backup has all the data and configuration of the primary instance. This data on the HA instance is not usable by other instances without being extracted by the backup-utils.
 
 ##### The purpose of the backup-utils

From 7c47b7b74dac82e112ac155f216a9a564b5e727e Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Fri, 28 Aug 2015 09:12:18 -0600
Subject: [PATCH 097/288] changed HA backup to HA replica

@nathos had a great recommendation to not use the term HA backup as it confuses things and instead use HA replica. I think he was spot on and made the changes.
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0055bd26b..db5fc0154 100644
--- a/README.md
+++ b/README.md
@@ -232,8 +232,9 @@ Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
 ### How does this data differ from the HA (High Availability) backup data?
-##### The purpose of the High Avaibility backup
-These two backups serve different purposes. The [HA backup](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a backup instance that is ready in case the primary instance becomes unavailable. The HA backup pulls data from the primary instance to ensure it is up to date in case it needs to be promoted to the primary instance. In that sense the HA backup has all the data and configuration of the primary instance. This data on the HA instance is not usable by other instances without being extracted by the backup-utils.
+
+##### The purpose of the High Avaibility replica
+These two tools serve different purposes. The [HA replica](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a replica instance that is ready in case the primary instance becomes unavailable. The HA replica pulls data from the primary instance to ensure it's data is current in the case it needs to be promoted to the primary instance. In that sense the HA replica has all the data and configuration of the primary instance. However, this data on the HA instance is not usable by other instances without being extracted by the backup-utils.
 
 ##### The purpose of the backup-utils
 The backup-utils data is meant to be used to restore an instance or set up a new instance. This backup data does not require the overhead of having a VM that can support running GitHub Enterprise. The backup-utils utility only copies over repository data, along with full snapshots of all other pertinent data stores. and formats this data so it can be reused in the restoration or setup of an instance. 

From 5935e78a289750206d8c1ed66dbeceb9d1aae983 Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Fri, 28 Aug 2015 09:38:06 -0600
Subject: [PATCH 098/288] added note saying both tools should be used

@nathos recommended having a note saying that we *do* recommend using both tools. it is in the first sentence now of this new section.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index db5fc0154..60f1d7f33 100644
--- a/README.md
+++ b/README.md
@@ -234,7 +234,7 @@ the disk location where snapshots are written.
 ### How does this data differ from the HA (High Availability) backup data?
 
 ##### The purpose of the High Avaibility replica
-These two tools serve different purposes. The [HA replica](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a replica instance that is ready in case the primary instance becomes unavailable. The HA replica pulls data from the primary instance to ensure it's data is current in the case it needs to be promoted to the primary instance. In that sense the HA replica has all the data and configuration of the primary instance. However, this data on the HA instance is not usable by other instances without being extracted by the backup-utils.
+These two tools serve different purposes and are best used separately as part of the recommended GitHub Enterprise setup. The [HA replica](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a replica instance that is ready in case the primary instance becomes unavailable. The HA replica pulls data from the primary instance to ensure it's data is current in the case it needs to be promoted to the primary instance. In that sense the HA replica has all the data and configuration of the primary instance. However, this data on the HA instance is not usable by other instances without being extracted by the backup-utils.
 
 ##### The purpose of the backup-utils
 The backup-utils data is meant to be used to restore an instance or set up a new instance. This backup data does not require the overhead of having a VM that can support running GitHub Enterprise. The backup-utils utility only copies over repository data, along with full snapshots of all other pertinent data stores. and formats this data so it can be reused in the restoration or setup of an instance. 

From bab312cb53f2f79c4020102b4f0d9e8faddf11eb Mon Sep 17 00:00:00 2001
From: Nathan Henderson <nathos@github.com>
Date: Fri, 28 Aug 2015 15:51:37 -0400
Subject: [PATCH 099/288] Linked to HA anchor; edit HA description language

- Link HA section in the TOC
- borrowed some descriptive language directly from the help docs
- Made "backup utilities" naming consistent with the rest of the README
- Remove version from help doc link to HA Replica article
- Removed `backup-utils` example
---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 60f1d7f33..c92099220 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ This repository includes backup and recovery utilities for [GitHub Enterprise][1
 - **[Using the backup and restore commands](#using-the-backup-and-restore-commands)**
 - **[Scheduling backups](#scheduling-backups)**
 - **[Backup snapshot file structure](#backup-snapshot-file-structure)**
+- **[How do backup snapshots differ from a HA (High Availability) replica?](#how-do-backup-snapshots-differ-from-a-ha-high-availability-replica)
 - **[Support](#support)**
 
 ### Features
@@ -231,15 +232,15 @@ most recent successful snapshot:
 Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
-### How does this data differ from the HA (High Availability) backup data?
+### How do backup snapshots differ from the HA (High Availability) replica?
+The backup utilities and [HA replica](https://help.github.com/enterprise/admin/guides/installation/high-availability-cluster-configuration/) serve different yet complementary purposes as part of a recommended GitHub Enterprise deployment.
 
 ##### The purpose of the High Avaibility replica
-These two tools serve different purposes and are best used separately as part of the recommended GitHub Enterprise setup. The [HA replica](https://help.github.com/enterprise/2.0/admin-guide/high-availability-cluster-configuration/) has the primary purpose of being another a replica instance that is ready in case the primary instance becomes unavailable. The HA replica pulls data from the primary instance to ensure it's data is current in the case it needs to be promoted to the primary instance. In that sense the HA replica has all the data and configuration of the primary instance. However, this data on the HA instance is not usable by other instances without being extracted by the backup-utils.
+The HA replica is a fully redundant secondary GitHub Enterprise instance, kept in sync with the primary instance via replication of all major datastores. This active/passive cluster configuration is designed to minimize service disruption in the event of hardware failure or major network outage affecting the primary instance. Because some forms of data corruption or loss may be replicated immediately from primary to replica, it is not a replacement for the backup utilities as part of your disaster recovery plan.
 
-##### The purpose of the backup-utils
-The backup-utils data is meant to be used to restore an instance or set up a new instance. This backup data does not require the overhead of having a VM that can support running GitHub Enterprise. The backup-utils utility only copies over repository data, along with full snapshots of all other pertinent data stores. and formats this data so it can be reused in the restoration or setup of an instance. 
+##### The purpose of the backup utilities
+Backup utility snapshots can be used to restore a GitHub Enterprise instance to a prior state, or set up a new instance. The backup host does not require the overhead of running another GitHub Enterprise instance. The backup utilities copy repository data, along with full snapshots of all other pertinent data stores. Backup snapshots are date-stamped, making rollback to previous states possible.
 
-As an example, if a company wanted to create a QA server to test upgrading GitHub Enterprise they could use the backup-utils utility to populate the QA server with data and settings from a snapshot and be up and running in a very short amount of time. The process is more complex to setup an HA instance and do the conversion after a data set has been copied over. The latter use case is not recommended. 
 
 ### Support
 

From 99a0ab7325c8a6de0555d06df4d008d81cc1c363 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Tue, 1 Sep 2015 10:19:39 +0100
Subject: [PATCH 100/288] Correct typo

---
 test/test-ghe-backup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index bc961a778..b36e036b2 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -252,7 +252,7 @@ begin_test "ghe-backup without manage-password file"
 )
 end_test
 
-begin_test "ghe-backup emtpy hookshot directory"
+begin_test "ghe-backup empty hookshot directory"
 (
   set -e
 

From 7fbe268f7775f21c9b2df375da5b9f197d6b7bea Mon Sep 17 00:00:00 2001
From: Nathan Henderson <nathos@github.com>
Date: Tue, 1 Sep 2015 10:54:01 -0400
Subject: [PATCH 101/288] Update current datetimestamp in directory structure
 example

The "current" symlink in the directory structure wasn't pointing to the the latest snapshot.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2e8470f33..f58045529 100644
--- a/README.md
+++ b/README.md
@@ -226,7 +226,7 @@ most recent successful snapshot:
           |- ssh-host-keys.tar
           |- strategy
           |- version
-       |- current -> 20140727T010000
+       |- current -> 20140728T010000
 
 Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.

From 3720f16da841542e3734ced7702796b14b6f4589 Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Wed, 2 Sep 2015 13:36:34 -0600
Subject: [PATCH 102/288] updated title and first paragraph

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c92099220..f1612aa8f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This repository includes backup and recovery utilities for [GitHub Enterprise][1
 - **[Using the backup and restore commands](#using-the-backup-and-restore-commands)**
 - **[Scheduling backups](#scheduling-backups)**
 - **[Backup snapshot file structure](#backup-snapshot-file-structure)**
-- **[How do backup snapshots differ from a HA (High Availability) replica?](#how-do-backup-snapshots-differ-from-a-ha-high-availability-replica)
+- **[How does backup utilities differ from an HA (High Availability) replica?](#how-does-backup-utilities-differ-from-an-ha-high-availability-replica)
 - **[Support](#support)**
 
 ### Features
@@ -232,8 +232,8 @@ most recent successful snapshot:
 Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
-### How do backup snapshots differ from the HA (High Availability) replica?
-The backup utilities and [HA replica](https://help.github.com/enterprise/admin/guides/installation/high-availability-cluster-configuration/) serve different yet complementary purposes as part of a recommended GitHub Enterprise deployment.
+### How does backup utilities differ from an HA (High Availability) replica?
+It is recommended that both backup utilities and an [HA replica](https://help.github.com/enterprise/admin/guides/installation/high-availability-cluster-configuration/) are used as part of a GitHub Enterprise deployment but they serve different roles.
 
 ##### The purpose of the High Avaibility replica
 The HA replica is a fully redundant secondary GitHub Enterprise instance, kept in sync with the primary instance via replication of all major datastores. This active/passive cluster configuration is designed to minimize service disruption in the event of hardware failure or major network outage affecting the primary instance. Because some forms of data corruption or loss may be replicated immediately from primary to replica, it is not a replacement for the backup utilities as part of your disaster recovery plan.

From b59e3cfddeb2d2b22aab4d2348f41676010f76b0 Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Wed, 2 Sep 2015 13:39:14 -0600
Subject: [PATCH 103/288] Made backup utilities paragraph more succinct

also fixed a typo
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f1612aa8f..88f9ce160 100644
--- a/README.md
+++ b/README.md
@@ -235,11 +235,11 @@ the disk location where snapshots are written.
 ### How does backup utilities differ from an HA (High Availability) replica?
 It is recommended that both backup utilities and an [HA replica](https://help.github.com/enterprise/admin/guides/installation/high-availability-cluster-configuration/) are used as part of a GitHub Enterprise deployment but they serve different roles.
 
-##### The purpose of the High Avaibility replica
+##### The purpose of the High Availability replica
 The HA replica is a fully redundant secondary GitHub Enterprise instance, kept in sync with the primary instance via replication of all major datastores. This active/passive cluster configuration is designed to minimize service disruption in the event of hardware failure or major network outage affecting the primary instance. Because some forms of data corruption or loss may be replicated immediately from primary to replica, it is not a replacement for the backup utilities as part of your disaster recovery plan.
 
 ##### The purpose of the backup utilities
-Backup utility snapshots can be used to restore a GitHub Enterprise instance to a prior state, or set up a new instance. The backup host does not require the overhead of running another GitHub Enterprise instance. The backup utilities copy repository data, along with full snapshots of all other pertinent data stores. Backup snapshots are date-stamped, making rollback to previous states possible.
+Backup utilities takes date-stamped snapshots of all major datastores. These snapshots are used to restore an instance to a prior state or set up a new instance without having another always-on GitHub Enterprise instance (like the HA replica).
 
 
 ### Support

From 2eed112eaace7074e55e1e4b302d0c72287d75be Mon Sep 17 00:00:00 2001
From: Matt Duff <mattcantstop@github.com>
Date: Thu, 3 Sep 2015 11:36:17 -0600
Subject: [PATCH 104/288] changed HA to High Availability. Referenced disaster
 recovery

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 88f9ce160..c1182a63d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This repository includes backup and recovery utilities for [GitHub Enterprise][1
 - **[Using the backup and restore commands](#using-the-backup-and-restore-commands)**
 - **[Scheduling backups](#scheduling-backups)**
 - **[Backup snapshot file structure](#backup-snapshot-file-structure)**
-- **[How does backup utilities differ from an HA (High Availability) replica?](#how-does-backup-utilities-differ-from-an-ha-high-availability-replica)
+- **[How does backup utilities differ from a High Availability replica?](#how-does-backup-utilities-differ-from-an-ha-high-availability-replica)
 - **[Support](#support)**
 
 ### Features
@@ -232,14 +232,14 @@ most recent successful snapshot:
 Note: the `GHE_DATA_DIR` variable set in `backup.config` can be used to change
 the disk location where snapshots are written.
 
-### How does backup utilities differ from an HA (High Availability) replica?
-It is recommended that both backup utilities and an [HA replica](https://help.github.com/enterprise/admin/guides/installation/high-availability-cluster-configuration/) are used as part of a GitHub Enterprise deployment but they serve different roles.
+### How does backup utilities differ from a High Availability replica?
+It is recommended that both backup utilities and an [High Availability replica](https://help.github.com/enterprise/admin/guides/installation/high-availability-cluster-configuration/) are used as part of a GitHub Enterprise deployment but they serve different roles.
 
 ##### The purpose of the High Availability replica
-The HA replica is a fully redundant secondary GitHub Enterprise instance, kept in sync with the primary instance via replication of all major datastores. This active/passive cluster configuration is designed to minimize service disruption in the event of hardware failure or major network outage affecting the primary instance. Because some forms of data corruption or loss may be replicated immediately from primary to replica, it is not a replacement for the backup utilities as part of your disaster recovery plan.
+The High Availability replica is a fully redundant secondary GitHub Enterprise instance, kept in sync with the primary instance via replication of all major datastores. This active/passive cluster configuration is designed to minimize service disruption in the event of hardware failure or major network outage affecting the primary instance. Because some forms of data corruption or loss may be replicated immediately from primary to replica, it is not a replacement for the backup utilities as part of your disaster recovery plan.
 
 ##### The purpose of the backup utilities
-Backup utilities takes date-stamped snapshots of all major datastores. These snapshots are used to restore an instance to a prior state or set up a new instance without having another always-on GitHub Enterprise instance (like the HA replica).
+Backup utilities are a disaster recovery tool. This tool takes date-stamped snapshots of all major datastores. These snapshots are used to restore an instance to a prior state or set up a new instance without having another always-on GitHub Enterprise instance (like the High Availability replica).
 
 
 ### Support

From b2dff3f34f31b92c831d3b43f7935555fe49e2cb Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 7 Sep 2015 10:53:31 +0900
Subject: [PATCH 105/288] Fix rendering of "How does backup utilities..." link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 72b406baf..272a609af 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This repository includes backup and recovery utilities for [GitHub Enterprise][1
 - **[Using the backup and restore commands](#using-the-backup-and-restore-commands)**
 - **[Scheduling backups](#scheduling-backups)**
 - **[Backup snapshot file structure](#backup-snapshot-file-structure)**
-- **[How does backup utilities differ from a High Availability replica?](#how-does-backup-utilities-differ-from-an-ha-high-availability-replica)
+- **[How does backup utilities differ from a High Availability replica?](#how-does-backup-utilities-differ-from-an-ha-high-availability-replica)**
 - **[Support](#support)**
 
 ### Features

From a0b6c976d72b4366b34a24954ab039b1d4b9d694 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 7 Sep 2015 10:56:11 +0900
Subject: [PATCH 106/288] Fix the link too

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 272a609af..a73d4d23c 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This repository includes backup and recovery utilities for [GitHub Enterprise][1
 - **[Using the backup and restore commands](#using-the-backup-and-restore-commands)**
 - **[Scheduling backups](#scheduling-backups)**
 - **[Backup snapshot file structure](#backup-snapshot-file-structure)**
-- **[How does backup utilities differ from a High Availability replica?](#how-does-backup-utilities-differ-from-an-ha-high-availability-replica)**
+- **[How does backup utilities differ from a High Availability replica?](#how-does-backup-utilities-differ-from-a-high-availability-replica)**
 - **[Support](#support)**
 
 ### Features

From bc97d5aa4b8b2a0bf942038bf6df71f52755271c Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Mon, 28 Sep 2015 15:56:57 +0200
Subject: [PATCH 107/288] Move in progress detection to separate file with pid

This changes the logic of detecting if a backup is in progress by
writing out the snapshot and PID of the process making the backup. This
improves the situation where a previous backup was killed in a non-clean
way. Clean failures in the sense of a proper exit (also non 0 exit
statuses) or using ctrl-c was already handled by traps.

This just removes the in-progress file if the process is no longer
running after the backup. It then cleans up the in-progress file and
lets the rest of the system clean up the failed backup.

Fixes #99
---
 bin/ghe-backup | 49 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index f1323518d..27211a33d 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -28,37 +28,56 @@ touch "incomplete"
 GHE_MAINTENANCE_MODE_ENABLED=false
 
 # To prevent multiple backup runs happening at the same time, we create a
-# in-progress symlink pointing to the snapshot directory. This will fail if
-# another backup is already in progress, giving us a form of locking.
+# in-progress file with the timestamp and pid of the backup process,
+# giving us a form of locking.
 #
-# Set up a trap to remove the in-progress symlink if we exit for any reason but
-# verify that we own the in-progress symlink before doing so.
+# Set up a trap to remove the in-progress file if we exit for any reason but
+# verify that we are the same process before doing so.
 #
 # The cleanup trap also handles disabling maintenance mode on the appliance if
 # it was automatically enabled.
 cleanup () {
-    if [ "$(readlink ../in-progress)" = "$GHE_SNAPSHOT_TIMESTAMP" ]; then
-        unlink ../in-progress
+  if [ -f ../in-progress ]; then
+    progress=$(cat ../in-progress)
+    snapshot=$(echo "$progress" | cut -d ' ' -f 1)
+    pid=$(echo "$progress" | cut -d ' ' -f 2)
+    if [ "$snapshot" = "$GHE_SNAPSHOT_TIMESTAMP" -a "$$" = $pid ]; then
+      unlink ../in-progress
     fi
+  fi
 
-    if $GHE_MAINTENANCE_MODE_ENABLED; then
-        ghe-maintenance-mode-disable "$GHE_HOSTNAME"
-    fi
+  if $GHE_MAINTENANCE_MODE_ENABLED; then
+    ghe-maintenance-mode-disable "$GHE_HOSTNAME"
+  fi
 }
 
 # Setup exit traps
 trap 'cleanup' EXIT
 trap 'exit $?' INT # ^C always terminate
 
-# Mark the snapshot as in-progress by creating the symlink. If this fails, it
-# means another ghe-backup run is already in progress and we should exit.
-# NOTE: The -n argument to ln is non-POSIX but widely supported.
-if ! ln -sn "$GHE_SNAPSHOT_TIMESTAMP" ../in-progress 2>/dev/null; then
-    snapshot="$(readlink ../in-progress)"
-    echo "Error: backup of $GHE_HOSTNAME already in progress in snapshot $snapshot. Aborting." 1>&2
+if [ -h ../in-progress ]; then
+  echo "Error: in progress backup from previous version detected." 1>&2
+  echo "If there is no backup in progress anymore, please remove" 1>&2
+  echo "the $GHE_DATA_DIR/in-progress symlink. This is only needed once." 1>&2
+  exit 1
+fi
+
+if [ -f ../in-progress ]; then
+  progress=$(cat ../in-progress)
+  snapshot=$(echo "$progress" | cut -d ' ' -f 1)
+  pid=$(echo "$progress" | cut -d ' ' -f 2)
+  if ! ps -p $pid -o command= | grep ghe-backup; then
+    # We can safely remove in-progress, ghe-prune-snapshots
+    # will clean up the failed backup.
+    unlink ../in-progress
+  else
+    echo "Error: backup process $pid of $GHE_HOSTNAME already in progress in snapshot $snapshot. Aborting." 1>&2
     exit 1
+  fi
 fi
 
+echo "$GHE_SNAPSHOT_TIMESTAMP $$" > ../in-progress
+
 echo "Starting backup of $GHE_HOSTNAME in snapshot $GHE_SNAPSHOT_TIMESTAMP"
 
 # Perform a host connection check and establish the remote appliance version.

From 4d6e261b7c6cd57058503c35ab9fccdd4bcb6135 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Mon, 28 Sep 2015 16:05:39 +0200
Subject: [PATCH 108/288] Add test for cleanup process

---
 test/test-ghe-backup.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index b36e036b2..1643481ad 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -230,7 +230,7 @@ begin_test "ghe-backup tarball strategy"
 )
 end_test
 
-begin_test "ghe-backup fails fast when other run in progress"
+begin_test "ghe-backup fails fast when old style run in progress"
 (
     set -e
 
@@ -241,6 +241,18 @@ begin_test "ghe-backup fails fast when other run in progress"
 )
 end_test
 
+begin_test "ghe-backup cleans up stale in-progress file"
+(
+    set -e
+
+    echo "20150928T153353 99999" > "$GHE_DATA_DIR/in-progress"
+    ghe-backup
+
+    [ ! -f "$GHE_DATA_DIR/in-progress" ]
+)
+end_test
+
+
 begin_test "ghe-backup without manage-password file"
 (
     set -e

From d301fd32f35b76b04fd5c8475a0351260ef24900 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Thu, 1 Oct 2015 10:43:36 +0200
Subject: [PATCH 109/288] Update wording of when old version backup progress is
 detected

---
 bin/ghe-backup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 27211a33d..e46e89fcf 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -56,9 +56,9 @@ trap 'cleanup' EXIT
 trap 'exit $?' INT # ^C always terminate
 
 if [ -h ../in-progress ]; then
-  echo "Error: in progress backup from previous version detected." 1>&2
+  echo "Error: detected a backup already in progress from a previous version of ghe-backup." 1>&2
   echo "If there is no backup in progress anymore, please remove" 1>&2
-  echo "the $GHE_DATA_DIR/in-progress symlink. This is only needed once." 1>&2
+  echo "the $GHE_DATA_DIR/in-progress symlink." 1>&2
   exit 1
 fi
 

From 0a2fc9e5652ac5bec9e29746de95f4e1582abf3f Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 19 Oct 2015 17:03:41 -0700
Subject: [PATCH 110/288] Update changelog

---
 debian/changelog | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 537d66986..5b05947e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+github-backup-utils (2.4.0) UNRELEASED; urgency=medium
+
+  * Moves the in-progress detection to a separate file with PID which is
+    removed if the process is no longer running after the backup. #145, #99
+  * Updates the README to explain why backup-utils is useful even if you have
+    the high availability replica running. #140
+  * Changes the use of the --link-dest option to only occur when backing up
+    populated directories. #138
+  * Adds logging to /var/log/syslog on the remote GitHub Enterprise appliance
+    to both ghe-backup and ghe-restore.  #131
+  * Restarts memcached after restoring to an already configured appliance to
+    ensure it doesn't contain out-of-sync information. #130
+  * Removes the temporary /data/user/repositories-nw-backup directory that
+    remains after successfully migrating the repository storage layout to the
+    new format used on GitHub Enterprise 2.2.0 and later after restoring a
+    backup from an older release of GitHub Enterprise. #129
+  * Add devscripts to Debian's build-depends for checkbashisms. #101
+  * Documents the -c option which forces the restoration of the configuration
+    information to an already configured appliance. #96
+
+ -- Colin Seymour <colin@github.com> Tue, 20 Oct 2015 00:02:37 +0000
+
 github-backup-utils (2.2.0) UNRELEASED; urgency=medium
 
   * Adds support for the new repositories filesystem layout include in

From 217b9459e8a394b7ec1684f2c31413200d69efdb Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 19 Oct 2015 17:09:44 -0700
Subject: [PATCH 111/288] 2.4.0 release

---
 share/github-backup-utils/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index ccbccc3dc..197c4d5c2 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.2.0
+2.4.0

From 54f3deb625f56ba2eb8193aa8003e55b4c240317 Mon Sep 17 00:00:00 2001
From: Colin Seymour <colin@github.com>
Date: Mon, 19 Oct 2015 17:14:29 -0700
Subject: [PATCH 112/288] Update changelog

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5b05947e8..26e45dd09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,7 @@ github-backup-utils (2.4.0) UNRELEASED; urgency=medium
   * Documents the -c option which forces the restoration of the configuration
     information to an already configured appliance. #96
 
- -- Colin Seymour <colin@github.com> Tue, 20 Oct 2015 00:02:37 +0000
+ -- Colin Seymour <colin@github.com>  Tue, 20 Oct 2015 00:02:37 +0000
 
 github-backup-utils (2.2.0) UNRELEASED; urgency=medium
 

From d686981c2c278cd90ca73a9181679228b2b12757 Mon Sep 17 00:00:00 2001
From: Tim Littlemore <tim@tjl2.com>
Date: Tue, 3 Nov 2015 10:02:03 +0000
Subject: [PATCH 113/288] Update README.md

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a73d4d23c..969aa42f1 100644
--- a/README.md
+++ b/README.md
@@ -93,13 +93,14 @@ download the most recent GitHub Enterprise version.
 
 [release]: https://github.com/github/backup-utils/releases
 
-### Migrating from GitHub Enterprise v11.10.34x to v2.0
+### Migrating from GitHub Enterprise v11.10.34x to v2.0, or v2.1
 
-If you are migrating from GitHub Enterprise version 11.10.34x to 2.0 or greater,
+If you are migrating from GitHub Enterprise version 11.10.34x to 2.0 or 2.1 
+(note, migrations to versions greater than 2.1 are not officially supported),
 please see the [Migrating from GitHub Enterprise v11.10.34x][10] documentation
 in the [GitHub Enterprise System Administrator's Guide][11]. It includes
 important information on using the backup utilities to migrate data from your
-v11.10.34x instance to v2.0.
+v11.10.34x instance to v2.0 or v2.1.
 
 ### Using the backup and restore commands
 

From a0d9253b58024759330b71ec761390352d2db71e Mon Sep 17 00:00:00 2001
From: Tim Littlemore <tim@tjl2.com>
Date: Tue, 3 Nov 2015 10:05:09 +0000
Subject: [PATCH 114/288] Update README.md

Fix the link to the edited title of the migration section.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 969aa42f1..5f76cf42e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ This repository includes backup and recovery utilities for [GitHub Enterprise][1
   - **[Storage requirements](#storage-requirements)**
   - **[GitHub Enterprise version requirements](#github-enterprise-version-requirements)**
 - **[Getting started](#getting-started)**
-- **[Migrating from GitHub Enterprise v11.10.34x to v2.0](#migrating-from-github-enterprise-v111034x-to-v20)**
+- **[Migrating from GitHub Enterprise v11.10.34x to v2.0](#migrating-from-github-enterprise-v111034x-to-v20-or-v21)**
 - **[Using the backup and restore commands](#using-the-backup-and-restore-commands)**
 - **[Scheduling backups](#scheduling-backups)**
 - **[Backup snapshot file structure](#backup-snapshot-file-structure)**

From 221c4d540cf27cc51ce8008b30cf9234448aa9f9 Mon Sep 17 00:00:00 2001
From: Jason Massey <jasonmassey@github.com>
Date: Thu, 3 Dec 2015 01:20:28 -0800
Subject: [PATCH 115/288] change s3cmd from put to sync

---
 share/github-backup-utils/ghe-s3-backup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-s3-backup b/share/github-backup-utils/ghe-s3-backup
index ef9838f0f..6f8079b68 100755
--- a/share/github-backup-utils/ghe-s3-backup
+++ b/share/github-backup-utils/ghe-s3-backup
@@ -23,4 +23,4 @@ s3cmd mb s3://$GHE_S3_BUCKET
 
 # Upload to S3.
 cd "$GHE_DATA_DIR"/current
-s3cmd --preserve put * s3://$GHE_S3_BUCKET
+s3cmd sync --delete-removed --follow-symlinks * s3://$GHE_S3_BUCKET

From 2471358109bc950c8976b38fa59a2f565e40aba5 Mon Sep 17 00:00:00 2001
From: Jason Massey <jasonmassey@github.com>
Date: Thu, 3 Dec 2015 10:42:42 -0800
Subject: [PATCH 116/288] make path to backup data dir explicit

---
 share/github-backup-utils/ghe-s3-backup | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-s3-backup b/share/github-backup-utils/ghe-s3-backup
index 6f8079b68..8311c503c 100755
--- a/share/github-backup-utils/ghe-s3-backup
+++ b/share/github-backup-utils/ghe-s3-backup
@@ -22,5 +22,4 @@ ghe-backup
 s3cmd mb s3://$GHE_S3_BUCKET
 
 # Upload to S3.
-cd "$GHE_DATA_DIR"/current
-s3cmd sync --delete-removed --follow-symlinks * s3://$GHE_S3_BUCKET
+s3cmd sync --delete-removed --follow-symlinks "$GHE_DATA_DIR"/current/ s3://$GHE_S3_BUCKET

From 53edcd09810218cc3ceccd27d45a179b2401052b Mon Sep 17 00:00:00 2001
From: Jason Massey <jasonmassey@users.noreply.github.com>
Date: Thu, 3 Dec 2015 13:03:04 -0800
Subject: [PATCH 117/288] Remove --follow-symlinks

S3 does not support symlinks, so this command was actually creating a new copy of the linked file
---
 share/github-backup-utils/ghe-s3-backup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-s3-backup b/share/github-backup-utils/ghe-s3-backup
index 8311c503c..b7101018c 100755
--- a/share/github-backup-utils/ghe-s3-backup
+++ b/share/github-backup-utils/ghe-s3-backup
@@ -22,4 +22,4 @@ ghe-backup
 s3cmd mb s3://$GHE_S3_BUCKET
 
 # Upload to S3.
-s3cmd sync --delete-removed --follow-symlinks "$GHE_DATA_DIR"/current/ s3://$GHE_S3_BUCKET
+s3cmd sync --delete-removed "$GHE_DATA_DIR"/current/ s3://$GHE_S3_BUCKET

From ed52c6b18683e81920475916d1eb0f7abf535964 Mon Sep 17 00:00:00 2001
From: Brent Beer <brent.beer@gmail.com>
Date: Thu, 3 Dec 2015 13:04:10 -0800
Subject: [PATCH 118/288] describe what the new command line flag would do

---
 share/github-backup-utils/ghe-s3-backup | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/github-backup-utils/ghe-s3-backup b/share/github-backup-utils/ghe-s3-backup
index b7101018c..63501a793 100755
--- a/share/github-backup-utils/ghe-s3-backup
+++ b/share/github-backup-utils/ghe-s3-backup
@@ -22,4 +22,5 @@ ghe-backup
 s3cmd mb s3://$GHE_S3_BUCKET
 
 # Upload to S3.
+# --delete-removed is to delete items in s3 that have been removed on the host
 s3cmd sync --delete-removed "$GHE_DATA_DIR"/current/ s3://$GHE_S3_BUCKET

From 01869ee78b96030c2f53ed36c8b9682dc03d01a3 Mon Sep 17 00:00:00 2001
From: Brent Beer <brentbeer@github.com>
Date: Thu, 3 Dec 2015 14:19:54 -0800
Subject: [PATCH 119/288] add GHE_S3_BUCKET variable for user's backup config

---
 backup.config-example | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backup.config-example b/backup.config-example
index 54b221187..17e43074a 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -26,3 +26,7 @@ GHE_NUM_SNAPSHOTS=10
 # Any extra options passed to the SSH command.  Nothing required by default
 #
 #GHE_EXTRA_SSH_OPTS=""
+
+# Add s3 bucket for configuring which bucket to use in ghe-s3-backup and
+# ghe-s3-restore
+# GHE_S3_BUCKET=""

From e12a23c1a6bf5b0197e059c2c3c9af4411811878 Mon Sep 17 00:00:00 2001
From: Ronald Chmara <ronabop@gmail.com>
Date: Mon, 11 Jan 2016 12:44:15 -0800
Subject: [PATCH 120/288] Old port 22 reference changed

Newer software versions utilize port 122, not port 22, for SSH
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f76cf42e..7c3b17c12 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Backup host software requirements are modest: Linux or other modern Unix
 operating system with [rsync][4] v2.6.4 or newer.
 
 The backup host must be able to establish network connections outbound to the
-GitHub appliance over SSH (port 22).
+GitHub appliance over SSH (port 22, or 122 (see below)).
 
 ##### Storage requirements
 

From 6497f296d68caace37998107388fe4932769a032 Mon Sep 17 00:00:00 2001
From: Ronald Chmara <ronabop@gmail.com>
Date: Fri, 29 Jan 2016 08:24:17 -0800
Subject: [PATCH 121/288] Update verbiage per Sergio Rubio (rubiojr)

Commit on PR https://github.com/github/backup-utils/pull/153#issuecomment-176767435
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7c3b17c12..1e97a926d 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Backup host software requirements are modest: Linux or other modern Unix
 operating system with [rsync][4] v2.6.4 or newer.
 
 The backup host must be able to establish network connections outbound to the
-GitHub appliance over SSH (port 22, or 122 (see below)).
+GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise 2.0 or newer instances and TCP port 22 is used for older versions (11.10.34X).
 
 ##### Storage requirements
 

From d08cbb3a3ece6cac47b0ed691393cb88d81ecc5d Mon Sep 17 00:00:00 2001
From: Ronald Chmara <ronabop@gmail.com>
Date: Fri, 29 Jan 2016 09:08:25 -0800
Subject: [PATCH 122/288] Minor comma added for grammar.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1e97a926d..b47c0e7d5 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Backup host software requirements are modest: Linux or other modern Unix
 operating system with [rsync][4] v2.6.4 or newer.
 
 The backup host must be able to establish network connections outbound to the
-GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise 2.0 or newer instances and TCP port 22 is used for older versions (11.10.34X).
+GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise 2.0 or newer instances, and TCP port 22 is used for older versions (11.10.34X).
 
 ##### Storage requirements
 

From bc9136ffccb91ab5520141f4f999e7346980d478 Mon Sep 17 00:00:00 2001
From: Fermentedbeats <fermentedbeats@github.com>
Date: Wed, 3 Feb 2016 14:00:48 -0800
Subject: [PATCH 123/288] add cert to -c flag description

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b47c0e7d5..8936c1a81 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ download the most recent GitHub Enterprise version.
 
 ### Migrating from GitHub Enterprise v11.10.34x to v2.0, or v2.1
 
-If you are migrating from GitHub Enterprise version 11.10.34x to 2.0 or 2.1 
+If you are migrating from GitHub Enterprise version 11.10.34x to 2.0 or 2.1
 (note, migrations to versions greater than 2.1 are not officially supported),
 please see the [Migrating from GitHub Enterprise v11.10.34x][10] documentation
 in the [GitHub Enterprise System Administrator's Guide][11]. It includes
@@ -158,7 +158,7 @@ enable when output is logged to a file.
 When restoring to an already configured GHE instance, settings and license data
 are *not* restored to prevent overwriting manual configuration on the restore
 host. This behavior can be overriden by passing the `-c` argument to `ghe-restore`,
-forcing settings and license data to be overwritten with the backup copy's data.
+forcing settings, certificate, and license data to be overwritten with the backup copy's data.
 
 ### Scheduling backups
 

From ea9a126325a50f1a4f5a13a6c13141be2cfb92bb Mon Sep 17 00:00:00 2001
From: CJ Johnson <fermentedbeats@github.com>
Date: Thu, 4 Feb 2016 09:06:05 -0800
Subject: [PATCH 124/288] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8936c1a81..bdd373901 100644
--- a/README.md
+++ b/README.md
@@ -155,7 +155,7 @@ The `ghe-backup` and `ghe-restore` commands also have a verbose output mode
 (`-v`) that lists files as they're being transferred. It's often useful to
 enable when output is logged to a file.
 
-When restoring to an already configured GHE instance, settings and license data
+When restoring to an already configured GHE instance, settings, certificate, and license data
 are *not* restored to prevent overwriting manual configuration on the restore
 host. This behavior can be overriden by passing the `-c` argument to `ghe-restore`,
 forcing settings, certificate, and license data to be overwritten with the backup copy's data.

From 9ce99bac112290a4f74018c719485820b4e2e8c7 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 9 Feb 2016 03:25:43 +0100
Subject: [PATCH 125/288] GitHub Enterprise Cluster support + SAML fixes

* Adds GitHub Enterpise 2.5 support
* Adds GitHub Enterprise Cluster support, mainly contributed by @dbussink
* Backups and restores SAML keypairs
---
 bin/ghe-backup                                |  61 +++-
 bin/ghe-host-check                            |   2 +-
 bin/ghe-restore                               |  93 +++--
 .../ghe-backup-alambic-cluster                |  86 +++++
 share/github-backup-utils/ghe-backup-config   |  11 +
 .../ghe-backup-es-audit-log                   |  32 ++
 .../ghe-backup-es-hookshot                    |  32 ++
 .../ghe-backup-pages-cluster                  |  86 +++++
 .../ghe-backup-redis-cluster                  |  37 ++
 .../ghe-backup-repositories-cluster           | 332 ++++++++++++++++++
 share/github-backup-utils/ghe-backup-settings |  13 +
 .../ghe-restore-alambic-cluster               | 121 +++++++
 .../ghe-restore-es-audit-log                  |  30 ++
 .../ghe-restore-pages-dpages                  | 120 +++++++
 .../ghe-restore-repositories-dgit             | 132 +++++++
 .../ghe-restore-repositories-gist             | 120 +++++++
 .../github-backup-utils/ghe-restore-settings  |  15 +-
 share/github-backup-utils/ghe-ssh             |   2 +-
 share/github-backup-utils/version             |   2 +-
 test/bin/ghe-export-es-audit-log              |   1 +
 20 files changed, 1287 insertions(+), 41 deletions(-)
 create mode 100644 share/github-backup-utils/ghe-backup-alambic-cluster
 create mode 100644 share/github-backup-utils/ghe-backup-es-audit-log
 create mode 100644 share/github-backup-utils/ghe-backup-es-hookshot
 create mode 100644 share/github-backup-utils/ghe-backup-pages-cluster
 create mode 100644 share/github-backup-utils/ghe-backup-redis-cluster
 create mode 100644 share/github-backup-utils/ghe-backup-repositories-cluster
 create mode 100644 share/github-backup-utils/ghe-restore-alambic-cluster
 create mode 100644 share/github-backup-utils/ghe-restore-es-audit-log
 create mode 100644 share/github-backup-utils/ghe-restore-pages-dpages
 create mode 100644 share/github-backup-utils/ghe-restore-repositories-dgit
 create mode 100644 share/github-backup-utils/ghe-restore-repositories-gist
 create mode 120000 test/bin/ghe-export-es-audit-log

diff --git a/bin/ghe-backup b/bin/ghe-backup
index e46e89fcf..564597dfe 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -86,6 +86,13 @@ echo "Starting backup of $GHE_HOSTNAME in snapshot $GHE_SNAPSHOT_TIMESTAMP"
 ghe_remote_version_required
 echo "$GHE_REMOTE_VERSION" > version
 
+# Figure out if we're restoring into cluster
+cluster=false
+if ghe-ssh "$GHE_HOSTNAME" -- \
+  "[ -f '$GHE_REMOTE_ROOT_DIR/etc/github/cluster' ]"; then
+  cluster=true
+fi
+
 # Log backup start message in /var/log/syslog on remote instance
 ghe_remote_logger "Starting backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
 
@@ -99,8 +106,13 @@ if [ $GHE_VERSION_MAJOR -eq 1 -a $GHE_VERSION_PATCH -lt 340 ]; then
     GHE_BACKUP_STRATEGY="tarball"
 fi
 
+if $cluster; then
+  GHE_BACKUP_STRATEGY="cluster"
+fi
+
 # Record the strategy with the snapshot so we will know how to restore.
 echo "$GHE_BACKUP_STRATEGY" > strategy
+export GHE_BACKUP_STRATEGY
 
 # If we're using the tarball backup strategy, put the appliance in maintenance
 # mode and wait for all writing processes to bleed out.
@@ -127,8 +139,21 @@ ghe-ssh "$GHE_HOSTNAME" -- /bin/bash > mysql.sql.gz ||
 failures="$failures mysql"
 
 echo "Backing up Redis database ..."
-ghe-backup-redis > redis.rdb ||
-failures="$failures redis"
+if $cluster; then
+  ghe-backup-redis-cluster > redis.rdb ||
+    failures="$failures redis"
+else
+  ghe-backup-redis > redis.rdb ||
+    failures="$failures redis"
+fi
+
+echo "Backing up audit log ..."
+ghe-backup-es-audit-log ||
+failures="$failures audit-log"
+
+echo "Backing up hookshot logs ..."
+ghe-backup-es-hookshot ||
+failures="$failures hookshot"
 
 echo "Backing up Git repositories ..."
 ghe-backup-repositories-${GHE_BACKUP_STRATEGY} ||
@@ -139,18 +164,30 @@ ghe-backup-pages-${GHE_BACKUP_STRATEGY} ||
 failures="$failures pages"
 
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    echo "Backing up asset attachments ..."
-    ghe-backup-userdata alambic_assets ||
-    failures="$failures alambic_assets"
-
-    echo "Backing up hook deliveries ..."
-    ghe-backup-userdata hookshot ||
-    failures="$failures hookshot"
+    if $cluster; then
+        echo "Backing up asset attachments ..."
+        ghe-backup-alambic-cluster ||
+        failures="$failures alambic_assets"
+    else
+        echo "Backing up asset attachments ..."
+        ghe-backup-userdata alambic_assets ||
+        failures="$failures alambic_assets"
+
+        echo "Backing up storage data ..."
+        ghe-backup-userdata storage ||
+        failures="$failures storage"
+
+        echo "Backing up hook deliveries ..."
+        ghe-backup-userdata hookshot ||
+        failures="$failures hookshot"
+    fi
 fi
 
-echo "Backing up Elasticsearch indices ..."
-ghe-backup-es-${GHE_BACKUP_STRATEGY} ||
-failures="$failures elasticsearch"
+if ! $cluster; then
+  echo "Backing up Elasticsearch indices ..."
+  ghe-backup-es-${GHE_BACKUP_STRATEGY} ||
+  failures="$failures elasticsearch"
+fi
 
 # If we're using the tarball backup strategy, bring the appliance out of
 # maintenance mode now instead of waiting until after pruning stale snapshots.
diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index d5be624ff..039ce168e 100755
--- a/bin/ghe-host-check
+++ b/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" >/dev/null; then
+            if echo "$output" | grep -i "port 22: connection refused\|Connection timed out during banner exchange" >/dev/null; then
                 exec "bin/$(basename $0)" "$hostname:122"
             fi
 
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 4f80b5c46..53742873c 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -97,6 +97,15 @@ elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     restore_settings=true
 fi
 
+# Figure out if we're restoring into cluster
+cluster=false
+if ghe-ssh "$GHE_HOSTNAME" -- \
+  "[ -f '$GHE_REMOTE_ROOT_DIR/etc/github/cluster' ]"; then
+  cluster=true
+  instance_configured=true
+  restore_settings=false
+fi
+
 # Figure out if this instance is in a replication pair
 if ghe-ssh "$GHE_HOSTNAME" -- "ghe-repl-status -r 2>/dev/null" \
   | grep -Eq "replica|primary"; then
@@ -176,40 +185,66 @@ fi
 # Make sure mysql and elasticsearch are prep'd and running before restoring into
 # appliances v2.x or greater. These services will not have been started on appliances
 # that have not been configured yet.
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+if ! $cluster; then
+  if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     echo "sudo ghe-service-ensure-mysql && sudo ghe-service-ensure-elasticsearch" |
     ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
+  fi
 fi
 
-# Remove temporary 2.2 storage migration directory if it exists
-echo "if [ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
-ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
+echo "Restoring MySQL database ..."
+gzip -dc "$GHE_RESTORE_SNAPSHOT_PATH/mysql.sql.gz" | ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-mysql'
 
-echo "Restoring Git repositories ..."
-ghe-restore-repositories-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
+echo "Restoring Redis database ..."
+ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-redis' < "$GHE_RESTORE_SNAPSHOT_PATH/redis.rdb" 1>&3
 
-echo "Restoring GitHub Pages ..."
-ghe-restore-pages-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
+if $cluster; then
+  echo "Restoring Git repositories into cluster ..."
+  ghe-restore-repositories-dgit "$GHE_HOSTNAME" 1>&3
 
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    echo "Restoring asset attachments ..."
-    ghe-restore-userdata alambic_assets "$GHE_HOSTNAME" 1>&3
+  echo "Restoring Gists into cluster ..."
+  ghe-restore-repositories-gist "$GHE_HOSTNAME" 1>&3
+else
+  # Remove temporary 2.2 storage migration directory if it exists
+  echo "if [ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
+  ghe-ssh "$GHE_HOSTNAME" -- /bin/sh 1>&3
 
-    echo "Restoring hook deliveries ..."
-    ghe-restore-userdata hookshot "$GHE_HOSTNAME" 1>&3
+  echo "Restoring Git repositories ..."
+  ghe-restore-repositories-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
 fi
 
-echo "Restoring MySQL database ..."
-gzip -dc "$GHE_RESTORE_SNAPSHOT_PATH/mysql.sql.gz" | ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-mysql' 1>&3
-
-echo "Restoring Redis database ..."
-ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-redis' < "$GHE_RESTORE_SNAPSHOT_PATH/redis.rdb" 1>&3
+if $cluster; then
+  echo "Restoring GitHub Pages into DPages..."
+  ghe-restore-pages-dpages "$GHE_HOSTNAME" 1>&3
+else
+  echo "Restoring GitHub Pages ..."
+  ghe-restore-pages-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
+fi
 
 echo "Restoring SSH authorized keys ..."
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/authorized-keys.json" 1>&3
 
-echo "Restoring Elasticsearch indices ..."
-ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
+if $cluster; then
+  echo "Restoring storage data ..."
+  ghe-restore-alambic-cluster "$GHE_HOSTNAME" 1>&3
+elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+  echo "Restoring asset attachments ..."
+  ghe-restore-userdata alambic_assets "$GHE_HOSTNAME" 1>&3
+
+  echo "Restoring storage data ..."
+  ghe-restore-userdata storage "$GHE_HOSTNAME" 1>&3
+
+  echo "Restoring hook deliveries ..."
+  ghe-restore-userdata hookshot "$GHE_HOSTNAME" 1>&3
+fi
+
+if $cluster; then
+  echo "Restoring ElasticSearch Audit logs"
+  ghe-restore-es-audit-log "$GHE_HOSTNAME" 1>&3
+else
+  echo "Restoring Elasticsearch indices ..."
+  ghe-restore-es-${GHE_BACKUP_STRATEGY} "$GHE_HOSTNAME" 1>&3
+fi
 
 # Restart an already running memcached to reset the cache after restore
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
@@ -220,10 +255,13 @@ fi
 
 # When restoring to a host that has already been configured, kick off a
 # config run to perform data migrations.
-if $instance_configured; then
+if $cluster; then
+  echo "Configuring cluster ..."
+  ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-config-apply" 1>&3 2>&3
+elif $instance_configured; then
   echo "Configuring storage ..."
   if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    ghe-ssh "$GHE_HOSTNAME" -- "sudo ghe-config-apply --full" 1>&3
+    ghe-ssh "$GHE_HOSTNAME" -- "ghe-config-apply --full" 1>&3 2>&3
   else
     echo "   This will take several minutes to complete..."
     ghe-ssh "$GHE_HOSTNAME" -- "sudo enterprise-configure" 1>&3 2>&3
@@ -239,8 +277,13 @@ update_restore_status "complete"
 # Log restore complete message in /var/log/syslog on remote instance
 ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_SNAPSHOT_TIMESTAMP}."
 
-echo "Restoring SSH host keys ..."
-ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+if ! $cluster; then
+  echo "Restoring SSH host keys ..."
+  ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+fi
 
 echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
-echo "Visit https://$hostname/setup/settings to review appliance configuration."
+
+if ! $cluster; then
+  echo "Visit https://$hostname/setup/settings to review appliance configuration."
+fi
diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
new file mode 100644
index 000000000..7d4276692
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -0,0 +1,86 @@
+#!/bin/sh
+#/ Usage: ghe-backup-alambic-cluster
+#/ Take an online, incremental snapshot of all Alambic Storage data
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-backup when the cluster strategy is used.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Set up remote host and root backup snapshot directory based on config
+host="$GHE_HOSTNAME"
+backup_dir="$GHE_SNAPSHOT_DIR/storage"
+
+# Verify rsync is available.
+if ! rsync --version 1>/dev/null 2>&1; then
+    echo "Error: rsync not found." 1>&2
+    exit 1
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Generate SSH config for forwarding
+
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+# git server hostnames
+hostnames=$(ghe_cluster_online_nodes "storage-server")
+
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no
+"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+# Make sure root backup dir exists if this is the first run
+mkdir -p "$backup_dir"
+
+# Removes the remote sync-in-progress file on exit, re-enabling GC operations
+# on the remote instance.
+cleanup() {
+  rm -f $config_file
+}
+trap 'cleanup' EXIT INT
+
+# If we have a previous increment and it is not empty, avoid transferring existing files via rsync's
+# --link-dest support. This also decreases physical space usage considerably.
+if [ -d "$GHE_DATA_DIR/current/storage" ] && [ "$(ls -A $GHE_DATA_DIR/current/storage)" ]; then
+  link_dest="--link-dest=../../current/storage"
+fi
+
+for hostname in $hostnames; do
+  echo 1>&3
+  echo "* Starting backup for host: $hostname"
+  # Sync all auxiliary repository data. This includes files and directories like
+  # HEAD, audit_log, config, description, info/, etc. No refs or object data
+  # should be transferred here.
+  echo 1>&3
+  echo "* Transferring storage files ..." 1>&3
+
+  # Transfer all data from the user data directory using rsync.
+  ghe-rsync -az \
+      -e "ssh -q $opts -p 122 -F $config_file -l $user" \
+      --rsync-path='sudo -u git rsync' \
+      $link_dest \
+      "$hostname:$GHE_REMOTE_DATA_USER_DIR/storage/" \
+      "$GHE_SNAPSHOT_DIR/storage" 1>&3
+done
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index cbe0051eb..521a91d2d 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -130,6 +130,10 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
 # Set "true" to get verbose logging of all ssh commands on stderr
 : ${GHE_VERBOSE_SSH:=false}
 
+# The location of the cluster configuration file file on the remote side.
+# This is always "/data/user/common/cluster.conf" for GitHub Cluster instances.
+# Use of this variable allows the location to be overridden in tests.
+: ${GHE_REMOTE_CLUSTER_CONF_FILE:="$GHE_REMOTE_DATA_DIR/user/common/cluster.conf"}
 
 ###############################################################################
 ### Dynamic remote version config
@@ -241,3 +245,10 @@ ghe_remote_logger () {
     echo "$@" |
     ghe-ssh "$GHE_HOSTNAME" -- logger -t backup-utils || true
 }
+
+# Usage: ghe_cluster_online_nodes role
+# Returns the online nodes with a certain role in cluster
+ghe_cluster_online_nodes () {
+    role=$1
+    echo "ghe-config --get-regexp cluster.*.$role | egrep 'true$' | awk '{ print \$1; }' | awk 'BEGIN { FS=\".\" }; { print \$2 };' | xargs -I{} -n1 bash -c 'if [ \"\$(ghe-config cluster.\$hostname.offline)\" != true ]; then ghe-config cluster.{}.hostname; fi'" | ghe-ssh "$GHE_HOSTNAME" /bin/bash
+}
diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
new file mode 100644
index 000000000..7ef6e40e3
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -0,0 +1,32 @@
+#!/bin/sh
+#/ Usage: ghe-backup-es-audit-log
+#/ Take a backup of audit logs in ElasticSearch.
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-backup.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Set up remote host and root elastic backup directory based on config
+host="$GHE_HOSTNAME"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Make sure root backup dir exists if this is the first run
+mkdir -p "$GHE_SNAPSHOT_DIR/audit-log"
+
+indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/audit_log*"' | cut -d ' ' -f 3)
+current_index=audit_log-$(ghe-ssh "$host" 'date +"%Y-%m"')
+
+for index in $indices; do
+  if [ -f $GHE_DATA_DIR/current/audit-log/$index.gz -a $index \< $current_index ]; then
+    # Hard link any older indices since they are read only and won't change
+    ln $GHE_DATA_DIR/current/audit-log/$index.gz $GHE_SNAPSHOT_DIR/audit-log/$index.gz
+  else
+    ghe-ssh "$host" "/usr/local/share/enterprise/ghe-es-dump-json 'http://localhost:9201/$index'" | gzip > $GHE_SNAPSHOT_DIR/audit-log/$index.gz
+  fi
+done
diff --git a/share/github-backup-utils/ghe-backup-es-hookshot b/share/github-backup-utils/ghe-backup-es-hookshot
new file mode 100644
index 000000000..7a69a7e52
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-es-hookshot
@@ -0,0 +1,32 @@
+#!/bin/sh
+#/ Usage: ghe-backup-es-hookshot
+#/ Take a backup of hookshot logs in ElasticSearch.
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-backup.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Set up remote host and root elastic backup directory based on config
+host="$GHE_HOSTNAME"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Make sure root backup dir exists if this is the first run
+mkdir -p "$GHE_SNAPSHOT_DIR/hookshot"
+
+indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/hookshot-logs-*"' | cut -d ' ' -f 3)
+current_index=hookshot-logs-$(ghe-ssh "$host" 'date +"%Y-%m-%d"')
+
+for index in $indices; do
+  if [ -f $GHE_DATA_DIR/current/hookshot/$index.gz -a $index \< $current_index ]; then
+    # Hard link any older indices since they are read only and won't change
+    ln $GHE_DATA_DIR/current/hookshot/$index.gz $GHE_SNAPSHOT_DIR/hookshot/$index.gz
+  else
+    ghe-ssh "$host" "/usr/local/share/enterprise/ghe-es-dump-json 'http://localhost:9201/$index'" | gzip > $GHE_SNAPSHOT_DIR/hookshot/$index.gz
+  fi
+done
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
new file mode 100644
index 000000000..a0807fe5f
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -0,0 +1,86 @@
+#!/bin/sh
+#/ Usage: ghe-backup-pages-cluster
+#/ Take an online, incremental snapshot of all Pages data
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-backup when the cluster strategy is used.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Set up remote host and root backup snapshot directory based on config
+host="$GHE_HOSTNAME"
+backup_dir="$GHE_SNAPSHOT_DIR/pages"
+
+# Verify rsync is available.
+if ! rsync --version 1>/dev/null 2>&1; then
+    echo "Error: rsync not found." 1>&2
+    exit 1
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Generate SSH config for forwarding
+
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+# git server hostnames
+hostnames=$(ghe_cluster_online_nodes "pages-server")
+
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no
+"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+# Make sure root backup dir exists if this is the first run
+mkdir -p "$backup_dir"
+
+# Removes the remote sync-in-progress file on exit, re-enabling GC operations
+# on the remote instance.
+cleanup() {
+  rm -f $config_file
+}
+trap 'cleanup' EXIT INT
+
+# If we have a previous increment and it is not empty, avoid transferring existing files via rsync's
+# --link-dest support. This also decreases physical space usage considerably.
+if [ -d "$GHE_DATA_DIR/current/pages" ] && [ "$(ls -A $GHE_DATA_DIR/current/pages)" ]; then
+  link_dest="--link-dest=../../current/pages"
+fi
+
+for hostname in $hostnames; do
+  echo 1>&3
+  echo "* Starting backup for host: $hostname"
+  # Sync all auxiliary repository data. This includes files and directories like
+  # HEAD, audit_log, config, description, info/, etc. No refs or object data
+  # should be transferred here.
+  echo 1>&3
+  echo "* Transferring pages files ..." 1>&3
+
+  # Transfer all data from the user data directory using rsync.
+  ghe-rsync -az \
+      -e "ssh -q $opts -p 122 -F $config_file -l $user" \
+      --rsync-path='sudo -u git rsync' \
+      $link_dest \
+      "$hostname:$GHE_REMOTE_DATA_USER_DIR/pages/" \
+      "$GHE_SNAPSHOT_DIR/pages" 1>&3
+done
diff --git a/share/github-backup-utils/ghe-backup-redis-cluster b/share/github-backup-utils/ghe-backup-redis-cluster
new file mode 100644
index 000000000..d571adb8d
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-redis-cluster
@@ -0,0 +1,37 @@
+#!/bin/sh
+#/ Usage: ghe-backup-redis-cluster
+#/ Take a snapshot of all Redis data. This is needed because older versions of
+#/ the remote side ghe-export-redis command use a blocking SAVE instead of a
+#/ non-blocking BGSAVE.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-backup command.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# Force a redis BGSAVE, and wait for it to complete.
+sudo=
+[ "$GHE_VERSION_MAJOR" -ge 2 ] && sudo="sudo"
+ghe-ssh "$GHE_HOSTNAME" /bin/sh <<EOF
+    set -e
+
+    redis_host=\$(ghe-config cluster.redis-master 2>/dev/null || echo "localhost")
+    timestamp=\$(redis-cli -h \$redis_host LASTSAVE)
+    redis-cli -h \$redis_host BGSAVE 1>/dev/null
+
+    while [ \$(redis-cli -h \$redis_host LASTSAVE) -eq \$timestamp ]; do
+        sleep 1
+    done
+
+    if [ "\$redis_host" != "localhost" ]; then
+      ssh \$redis_host $sudo cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'
+    else
+      $sudo cat '$GHE_REMOTE_DATA_USER_DIR/redis/dump.rdb'
+    fi
+EOF
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
new file mode 100644
index 000000000..54a6931cc
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -0,0 +1,332 @@
+#!/bin/sh
+#/ Usage: ghe-backup-repositories-cluster
+#/ Take an online, incremental snapshot of all Git repository data.
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-backup when the cluster strategy is used.
+set -e
+
+# This command is designed to allow for transferring active Git repository data
+# from a GitHub instance to a backup site in a way that ensures data is
+# captured in a consistent state even when being written to.
+#
+# - All Git GC operations are disabled on the GitHub instance for the duration of
+#   the backup. This removes the possibly of objects or packs being removed
+#   while the backup is in progress.
+#
+# - In progress Git GC operations are given a cooldown window to complete. The
+#   script will sleep for up to 60 seconds waiting for GC operations to finish.
+#
+# - Git repository data is transferred in a specific order: auxiliary files,
+#   packed refs, loose refs, reflogs, and finally objects and pack files in that
+#   order. This ensures that all referenced objects are captured.
+#
+# - Git GC operations are re-enabled on the GitHub instance.
+#
+# The script uses multiple runs of rsync to transfer repository files. Each run
+# includes a list of filter rules that ensure only specific types of files are
+# transferred.
+#
+# See the "FILTER RULES" and "INCLUDE/EXCLUDE PATTERN RULES" sections of the
+# rsync(1) manual for more information:
+#      <http://rsync.samba.org/ftp/rsync/rsync.html>
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+backup_dir="$GHE_SNAPSHOT_DIR/repositories"
+
+# Location of last good backup for rsync --link-dest
+backup_current="$GHE_DATA_DIR/current/repositories"
+
+# Verify rsync is available.
+if ! rsync --version 1>/dev/null 2>&1; then
+    echo "Error: rsync not found." 1>&2
+    exit 1
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Generate SSH config for forwarding
+
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+# git server hostnames
+hostnames=$(ghe_cluster_online_nodes "git-server")
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no
+"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+# Remote sync-in-progress file location. When this file exists, Git GC
+# operations are disabled on the GitHub instance.
+sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
+
+# Make sure root backup dir exists if this is the first run
+mkdir -p "$backup_dir"
+
+# Removes the remote sync-in-progress file on exit, re-enabling GC operations
+# on the remote instance.
+cleanup() {
+  for hostname in $hostnames; do
+    ghe-ssh -F $config_file "$hostname:$port" -- "sudo rm -f '$sync_in_progress_file'"
+  done
+  rm -f $config_file
+}
+trap 'cleanup' EXIT
+trap 'exit $?' INT # ^C always terminate
+
+wait_pids=""
+for hostname in $hostnames; do
+  # Touch the sync-in-progress file, disabling GC operations, and wait for all
+  # active GC processes to finish on the remote side.
+  echo "
+      set -e
+      sudo -u git touch '$sync_in_progress_file'
+
+      sanity=0
+      while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
+          # note: the bracket synta[x] below is to prevent matches against the
+          # grep process itself.
+          if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
+              sleep 1
+              sanity=\$(( sanity + 1 ))
+          else
+              exit 0
+          fi
+      done
+      exit 7
+  " | ssh -q $opts -p $port -F $config_file -l $user $hostname -- /bin/sh
+  wait_pids="$wait_pids $hostname:$!"
+done
+
+# strip leading space
+wait_pids="$(echo -e "${wait_pids}" | sed -e 's/^[[:space:]]*//')"
+
+# wait for jobs one by one, bail on the first one
+for pid in $wait_pids; do
+  # pull out pid:hostname pairs into vars
+  wait_hostname="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $1; }')"
+  wait_pid="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $2; }')"
+  wait $wait_pid || {
+      res=$?
+      if [ $res = 7 ]; then
+          echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds on host: $wait_hostname. Aborting..." 1>&2
+      fi
+      exit $res
+  }
+  unset wait_hostname wait_pid
+done
+
+unset wait_pids
+
+# If we have a previous increment, avoid transferring existing files via rsync's
+# --link-dest support. This also decreases physical space usage considerably.
+if [ -d "$backup_current" ]; then
+    link_dest="--link-dest=../../current/repositories"
+fi
+
+# Transfer repository data from a GitHub instance to the current snapshot
+# directory, using a previous snapshot to avoid transferring files that have
+# already been transferred. A set of rsync filter rules are provided on stdin
+# for each invocation.
+rsync_repository_data () {
+    port=$(ssh_port_part "$1")
+    host=$(ssh_host_part "$1")
+
+    shift
+    ghe-rsync -a \
+        -e "ssh -q $opts -p $port -F $config_file -l $user" \
+        $link_dest "$@" \
+        --rsync-path='sudo -u git rsync' \
+        --include-from=- --exclude=\* \
+        "$host:$GHE_REMOTE_DATA_USER_DIR/repositories/" \
+        "$backup_dir" 1>&3
+}
+
+
+for hostname in $hostnames; do
+  echo 1>&3
+  echo "* Starting backup for host: $hostname"
+  # Sync all auxiliary repository data. This includes files and directories like
+  # HEAD, audit_log, config, description, info/, etc. No refs or object data
+  # should be transferred here.
+  echo 1>&3
+  echo "* Transferring auxiliary files ..." 1>&3
+  rsync_repository_data $hostname:122 -z <<RULES
+- /__*__/
+- /info/
+
++ /*/
++ /*/*.git
+- /*/*.git/objects
+- /*/*.git/refs
+- /*/*.git/packed-refs
+- /*/*.git/logs
++ /*/*.git/**
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
+- /*/??/??/??/gist/*.git/objects
+- /*/??/??/??/gist/*.git/refs
+- /*/??/??/??/gist/*.git/packed-refs
+- /*/??/??/??/gist/*.git/logs
++ /*/??/??/??/gist/*.git/**
+
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
+- /*/nw/??/??/??/*/*.git/objects
+- /*/nw/??/??/??/*/*.git/refs
+- /*/nw/??/??/??/*/*.git/packed-refs
+- /*/nw/??/??/??/*/*.git/logs
++ /*/nw/??/??/??/*/*.git/**
+RULES
+
+  # Sync packed refs files. This is performed before sync'ing loose refs since
+  # loose refs trump packed-refs information.
+  echo 1>&3
+  echo "* Transferring packed-refs files ..." 1>&3
+  rsync_repository_data $hostname:122 -z <<RULES
+- /__*__/
+- /info/
+
++ /*/
++ /*/*.git
++ /*/*.git/packed-refs
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
++ /*/??/??/??/gist/*.git/packed-refs
+
++ /*/nw/??/
++ /*/nw/??/??/
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
++ /*/nw/??/??/??/*/*.git/packed-refs
+RULES
+
+# Sync loose refs and reflogs. This must be performed before object data is
+# transferred to ensure that all referenced objects are included.
+echo 1>&3
+echo "* Transferring refs and reflogs ..."  1>&3
+rsync_repository_data $hostname:122 -z <<RULES
+- /__*__/
+- /info/
+
++ /*/
++ /*/*.git
++ /*/*.git/refs
++ /*/*.git/refs/**
++ /*/*.git/logs
++ /*/*.git/logs/**
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
++ /*/??/??/??/gist/*.git/refs
++ /*/??/??/??/gist/*.git/refs/**
++ /*/??/??/??/gist/*.git/logs
++ /*/??/??/??/gist/*.git/logs/**
+
++ /*/nw/??/
++ /*/nw/??/??/
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
++ /*/nw/??/??/??/*/*.git/refs
++ /*/nw/??/??/??/*/*.git/refs/**
++ /*/nw/??/??/??/*/*.git/logs
++ /*/nw/??/??/??/*/*.git/logs/**
+RULES
+
+  # Sync git objects and pack files. Compression is disabled during this phase
+  # since these files are already well compressed.
+  echo 1>&3
+  echo "* Transferring objects and packs ..." 1>&3
+  rsync_repository_data $hostname:122 -H <<RULES
+- /__*__/
+- /info/
+
++ /*/
++ /*/*.git
++ /*/*.git/objects
+- /*/*.git/objects/**/tmp_*
++ /*/*.git/objects/**
+
++ /*/??/
++ /*/??/??/
++ /*/??/??/??/
++ /*/??/??/??/gist/
++ /*/??/??/??/gist/*.git
++ /*/??/??/??/gist/*.git/objects
+- /*/??/??/??/gist/*.git/objects/**/tmp_*
++ /*/??/??/??/gist/*.git/objects/**
+
++ /*/nw/??/
++ /*/nw/??/??/
++ /*/nw/??/??/??/
++ /*/nw/??/??/??/*/
++ /*/nw/??/??/??/*/*.git
++ /*/nw/??/??/??/*/*.git/objects
+- /*/nw/??/??/??/*/*.git/objects/**/tmp_*
++ /*/nw/??/??/??/*/*.git/objects/**
+RULES
+
+  # Sync __special__ data directories, including the __alambic_assets__,
+  # __hookshot__, and __purgatory__ directories. The __nodeload_archives__,
+  # __gitmon__, and __render__ directories are excludes since they act only as
+  # caches.
+  #
+  # Under v2.x and greater, only the special __purgatory__ directory remains under
+  # /data/repositories. All other special user data directories have been moved under
+  # the /data/user directory.
+  echo 1>&3
+  echo "* Transferring special data directories ..." 1>&3
+  rsync_repository_data $hostname:122 <<RULES
+- /__nodeload_archives__/
+- /__gitmon__/
+- /__render__/
++ /__*__/
++ /__*__/**
++ /info/
+- /info/lost+found/
++ /info/*
+RULES
+  echo 1>&3
+done
diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index 4d618c12a..a6691c740 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -37,4 +37,17 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     else
         unlink manage-password+
     fi
+
+    if ghe-ssh "$host" -- "test -f $GHE_REMOTE_DATA_USER_DIR/common/idp.crt"; then
+      echo "* Transferring SAML keys ..." 1>&3
+      ghe-ssh $host -- sudo tar -C $GHE_REMOTE_DATA_USER_DIR/common/ -cf - "idp.crt saml-sp.p12" > saml-keys.tar
+    fi
+fi
+
+if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
+  echo "* Transferring cluster configuration ..." 1>&3
+  if ! ghe-ssh "$host" -- "sudo cat $GHE_REMOTE_CLUSTER_CONF_FILE 2>/dev/null" > cluster.conf; then
+    echo "Error: Enterprise Cluster is not configured yet, backup will fail" >&2
+    exit 1
+  fi
 fi
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
new file mode 100644
index 000000000..368c545e3
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -0,0 +1,121 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-alambic-cluster
+#/ Restore Alambic assets from an rsync snapshot of all assets to a GitHub cluster.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when restoring into a cluster.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Find the binary blobs to restore
+storage_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/ && find storage -mindepth 4 -maxdepth 4 | cut -d / -f2-)
+
+# No need to restore anything, early exit
+if [ -z "$storage_paths" ]; then
+  echo "Warning: Storage backup missing. Skipping ..."
+  exit 0
+fi
+
+# Generate SSH config for forwarding
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+cleanup() {
+  for pid in $(jobs -p); do
+    kill -KILL $pid > /dev/null 1>&2 || true
+  done
+  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+}
+
+trap 'cleanup' INT TERM EXIT
+
+rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+mkfifo ssh_routes_in
+mkfifo ssh_routes_out
+mkfifo ssh_finalize_in
+mkfifo ssh_finalize_out
+
+echo "Setting up storage processes"
+
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-routes - < ssh_routes_out > ssh_routes_in &
+ssh_routes_pid=$!
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-finalize - < ssh_finalize_out > ssh_finalize_in &
+ssh_finalize_pid=$!
+
+echo "Set up storage processes"
+
+exec 4> ssh_routes_out
+exec 5> ssh_finalize_out
+
+for storage_path in $storage_paths; do
+  oid=$(echo $storage_path | awk -F/ '{print $(NF)}')
+  echo "$oid" >&4
+  read routes < ssh_routes_in
+
+  for route in $routes; do
+    ghe-rsync -aHR --delete \
+      -e "ssh -q $opts -p $port -F $config_file -l $user" \
+      --rsync-path="sudo -u git rsync" \
+      "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/storage/./$storage_path" \
+      "$route:$GHE_REMOTE_DATA_USER_DIR/storage" &
+  done
+
+  for pid in $(jobs -p); do
+    if [ $pid = $ssh_routes_pid -o $pid = $ssh_finalize_pid ]; then
+      continue
+    fi
+    wait $pid
+    ret_code=$?
+    if [ "$ret_code" != "0" ]; then
+      echo "$pid exited $ret_code"
+      exit $ret_code
+    fi
+  done
+
+  echo "$oid $routes" >&5
+done
+
+exec 4>&-
+exec 5>&-
+
+# Ensure to flush these and close the pipes
+cat ssh_routes_in > /dev/null
+cat ssh_finalize_in > /dev/null
+
+wait $ssh_routes_pid > /dev/null 1>&2 || true
+wait $ssh_finalize_pid > /dev/null 1>&2 || true
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
new file mode 100644
index 000000000..e224dcfc6
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -0,0 +1,30 @@
+#!/bin/sh
+#/ Usage: ghe-restore-es-audit-log
+#/ Take a backup of audit logs in ElasticSearch.
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-backup.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ $# -lt 1 ] && print_usage
+
+GHE_HOSTNAME="$1"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+last_index=$(ghe-ssh "$GHE_HOSTNAME" 'curl -s "localhost:9201/_cat/indices/audit_log*"' | cut -d ' ' -f 3 | sort | tail -1)
+
+indices=$(ls -1 $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/*.gz | xargs -I{} -n1 basename {} .gz)
+
+for index in $indices; do
+  if [ -z "$last_index" ] || ! [ $index \< $last_index ]; then
+    echo "Restoring $index"
+    gzip -dc $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/$index.gz | ghe-ssh "$GHE_HOSTNAME" "/usr/local/share/enterprise/ghe-es-load-json 'http://localhost:9201/$index'"
+  fi
+done
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
new file mode 100644
index 000000000..ff2746f47
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-pages-dpages <host>
+#/ Restore repositories fron an rsync snapshot of all Git repository data to a GitHub cluster.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when restoring into a cluster.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Find the pages to restore
+pages_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/ && find pages -mindepth 5 -maxdepth 5 | cut -d / -f2-)
+
+# No need to restore anything, early exit
+if [ -z "$pages_paths" ]; then
+  echo "Warning: Pages backup missing. Skipping ..."
+  exit 0
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# Generate SSH config for forwarding
+
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ServerAliveInterval 60
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+cleanup() {
+  for pid in $(jobs -p); do
+    kill -KILL $pid > /dev/null 2>&1 || true
+  done
+  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+}
+
+trap 'cleanup' INT TERM EXIT
+
+rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+mkfifo ssh_routes_in
+mkfifo ssh_routes_out
+mkfifo ssh_finalize_in
+mkfifo ssh_finalize_out
+
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dpages-cluster-import-routes - < ssh_routes_out > ssh_routes_in &
+ssh_routes_pid=$!
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dpages-cluster-import-finalize - < ssh_finalize_out > ssh_finalize_in &
+ssh_finalize_pid=$!
+
+exec 4> ssh_routes_out
+exec 5> ssh_finalize_out
+
+for pages_path in $pages_paths; do
+  page_id=$(echo $pages_path | awk -F/ '{print $(NF)}')
+  echo "$page_id" >&4
+  read routes < ssh_routes_in
+
+  for route in $routes; do
+    ghe-rsync -aHR --delete \
+      -e "ssh -q $opts -p $port -F $config_file -l $user" \
+      --rsync-path="sudo -u git rsync" \
+      "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/pages/./$pages_path" \
+      "$route:$GHE_REMOTE_DATA_USER_DIR/pages" &
+  done
+
+  for pid in $(jobs -p); do
+    if [ $pid = $ssh_routes_pid -o $pid = $ssh_finalize_pid ]; then
+      continue
+    fi
+    wait $pid
+    ret_code=$?
+    if [ "$ret_code" != "0" ]; then
+      echo "$pid exited $ret_code"
+      exit $ret_code
+    fi
+  done
+
+  echo "$page_id $routes" >&5
+  read output < ssh_finalize_in
+done
+
+exec 4>&-
+exec 5>&-
+
+# Ensure to flush these and close the pipes
+cat ssh_routes_in > /dev/null &
+cat ssh_finalize_in > /dev/null &
+
+wait $ssh_routes_pid > /dev/null 2>&1 || true
+wait $ssh_finalize_pid > /dev/null 2>&1 || true
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
new file mode 100644
index 000000000..b90129c40
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -0,0 +1,132 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-repositories-dgit <host>
+#/ Restore repositories fron an rsync snapshot of all Git repository data to a GitHub cluster.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when restoring into a cluster.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+network_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/ && find repositories -mindepth 6 -maxdepth 7 -name \*.git -exec dirname {} \; | uniq | grep nw | cut -d / -f2-)
+
+if [ -z "$network_paths" ]; then
+  echo "Warning: Repositories backup missing. Skipping ..."
+  exit 0
+fi
+
+# Generate SSH config for forwarding
+
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ServerAliveInterval 60
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+cleanup() {
+  for pid in $(jobs -p); do
+    kill -KILL $pid > /dev/null 2>&1 || true
+  done
+  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+}
+
+trap 'cleanup' INT TERM EXIT
+
+rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+mkfifo ssh_routes_in
+mkfifo ssh_routes_out
+mkfifo ssh_finalize_in
+mkfifo ssh_finalize_out
+
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dgit-cluster-import-routes - < ssh_routes_out > ssh_routes_in &
+ssh_routes_pid=$!
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dgit-cluster-import-finalize - < ssh_finalize_out > ssh_finalize_in &
+ssh_finalize_pid=$!
+
+exec 4> ssh_routes_out
+exec 5> ssh_finalize_out
+
+for network_path in $network_paths; do
+  network_id=$(echo $network_path | awk -F/ '{print $(NF)}')
+  echo "$network_id" >&4
+  read routes < ssh_routes_in
+
+  for route in $routes; do
+    ghe-rsync -aHR --delete \
+      -e "ssh -q $opts -p $port -F $config_file -l $user" \
+      --rsync-path="sudo -u git rsync" \
+      "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/./$network_path" \
+      "$route:$GHE_REMOTE_DATA_USER_DIR/repositories" &
+  done
+
+  for pid in $(jobs -p); do
+    if [ $pid = $ssh_routes_pid -o $pid = $ssh_finalize_pid ]; then
+      continue
+    fi
+    wait $pid
+    ret_code=$?
+    if [ "$ret_code" != "0" ]; then
+      echo "$pid exited $ret_code"
+      exit $ret_code
+    fi
+  done
+
+  echo "$network_id /data/repositories/$network_path $routes" >&5
+  read output < ssh_finalize_in
+done
+
+exec 4>&-
+exec 5>&-
+
+# Ensure to flush output and close pipes
+cat ssh_routes_in > /dev/null &
+cat ssh_finalize_in > /dev/null &
+
+wait $ssh_routes_pid > /dev/null 2>&1 || true
+wait $ssh_finalize_pid > /dev/null 2>&1 || true
+
+if [ -d $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info ]; then
+  for route in `ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -p`; do
+    if ! ghe-rsync -a --delete \
+        -e "ssh -q $opts -p $port -F $config_file -l $user" \
+        --rsync-path="sudo -u git rsync" \
+        "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info/" \
+        "$route:$GHE_REMOTE_DATA_USER_DIR/repositories/info"; then
+      echo "Error restoring /data/repositories/info to $route"
+    fi
+  done
+else
+  ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -- rm -f /data/repositories/info/*
+fi
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
new file mode 100644
index 000000000..a4337bcce
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-repositories-gist <host>
+#/ Restore repositories fron an rsync snapshot of all Git repository data to a GitHub cluster.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when restoring into a cluster.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Find the gists to restore
+gist_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/  && find repositories -mindepth 6 -maxdepth 7 -name \*.git | grep gist | cut -d / -f2-)
+
+# No need to restore anything, early exit
+if [ -z "$gist_paths" ]; then
+  echo "Warning: Gist backup missing. Skipping ..."
+  exit 0
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# Generate SSH config for forwarding
+
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ServerAliveInterval 60
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+cleanup() {
+  for pid in $(jobs -p); do
+    kill -KILL $pid > /dev/null 2>&1 || true
+  done
+  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+}
+
+trap 'cleanup' INT TERM EXIT
+
+rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+mkfifo ssh_routes_in
+mkfifo ssh_routes_out
+mkfifo ssh_finalize_in
+mkfifo ssh_finalize_out
+
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/gist-cluster-import-routes - < ssh_routes_out > ssh_routes_in &
+ssh_routes_pid=$!
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/gist-cluster-import-finalize - < ssh_finalize_out > ssh_finalize_in &
+ssh_finalize_pid=$!
+
+exec 4> ssh_routes_out
+exec 5> ssh_finalize_out
+
+for gist_path in $gist_paths; do
+  gist_id=$(basename $(echo $gist_path | awk -F/ '{print $(NF)}') .git)
+  echo "$gist_id" >&4
+  read routes < ssh_routes_in
+
+  for route in $routes; do
+    ghe-rsync -aHR --delete \
+      -e "ssh -q $opts -p $port -F $config_file -l $user" \
+      --rsync-path="sudo -u git rsync" \
+      "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/./$gist_path" \
+      "$route:$GHE_REMOTE_DATA_USER_DIR/repositories" &
+  done
+
+  for pid in $(jobs -p); do
+    if [ $pid = $ssh_routes_pid -o $pid = $ssh_finalize_pid ]; then
+      continue
+    fi
+    wait $pid
+    ret_code=$?
+    if [ "$ret_code" != "0" ]; then
+      echo "$pid exited $ret_code"
+      exit $ret_code
+    fi
+  done
+
+  echo "$gist_id /data/repositories/$gist_path $routes" >&5
+  read output < ssh_finalize_in
+done
+
+exec 4>&-
+exec 5>&-
+
+# Ensure to flush these and close the pipes
+cat ssh_routes_in > /dev/null &
+cat ssh_finalize_in > /dev/null &
+
+wait $ssh_routes_pid > /dev/null 2>&1 || true
+wait $ssh_finalize_pid > /dev/null 2>&1 || true
diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index 0c5aaa054..e3cfe46c9 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -37,7 +37,7 @@ fi
 # 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
+  exit 0
 fi
 
 echo "Restoring license ..."
@@ -49,3 +49,16 @@ if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" ]; then
     cat "$GHE_RESTORE_SNAPSHOT_PATH/manage-password" |
     ghe-ssh "$GHE_HOSTNAME" -- "ghe-import-passwords"
 fi
+
+if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
+  echo "Restoring cluster configuration ..."
+    cat "$GHE_RESTORE_SNAPSHOT_PATH/cluster.conf" |
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo tee $GHE_REMOTE_CLUSTER_CONF_FILE >/dev/null"
+fi
+
+# Restore SAML keys if present.
+if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/saml-keys.tar" ]; then
+    echo "Restoring SAML keys ..."
+    cat "$GHE_RESTORE_SNAPSHOT_PATH/saml-keys.tar" |
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo tar -C $GHE_REMOTE_DATA_USER_DIR/common/ -xf -"
+fi
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 19e6e4029..67f7e0fff 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -13,7 +13,7 @@ cd $(dirname "$0")/../..
 opts="$GHE_EXTRA_SSH_OPTS"
 while true; do
     case "$1" in
-        -p|-l|-o)
+        -p|-l|-o|-F)
             opts="$opts $1 $2"
             shift 2
             ;;
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 197c4d5c2..437459cd9 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.4.0
+2.5.0
diff --git a/test/bin/ghe-export-es-audit-log b/test/bin/ghe-export-es-audit-log
new file mode 120000
index 000000000..a772e4ad9
--- /dev/null
+++ b/test/bin/ghe-export-es-audit-log
@@ -0,0 +1 @@
+ghe-fake-export-command
\ No newline at end of file

From 7468a6633cdb6be48f0484874e3155ba5ebae725 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 9 Feb 2016 03:36:45 +0100
Subject: [PATCH 126/288] Make new scripts executable

---
 share/github-backup-utils/ghe-backup-alambic-cluster      | 0
 share/github-backup-utils/ghe-backup-es-audit-log         | 0
 share/github-backup-utils/ghe-backup-es-hookshot          | 0
 share/github-backup-utils/ghe-backup-pages-cluster        | 0
 share/github-backup-utils/ghe-backup-redis-cluster        | 0
 share/github-backup-utils/ghe-backup-repositories-cluster | 0
 share/github-backup-utils/ghe-restore-alambic-cluster     | 0
 share/github-backup-utils/ghe-restore-es-audit-log        | 0
 share/github-backup-utils/ghe-restore-pages-dpages        | 0
 share/github-backup-utils/ghe-restore-repositories-dgit   | 0
 share/github-backup-utils/ghe-restore-repositories-gist   | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-alambic-cluster
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-es-audit-log
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-es-hookshot
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-pages-cluster
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-redis-cluster
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-repositories-cluster
 mode change 100644 => 100755 share/github-backup-utils/ghe-restore-alambic-cluster
 mode change 100644 => 100755 share/github-backup-utils/ghe-restore-es-audit-log
 mode change 100644 => 100755 share/github-backup-utils/ghe-restore-pages-dpages
 mode change 100644 => 100755 share/github-backup-utils/ghe-restore-repositories-dgit
 mode change 100644 => 100755 share/github-backup-utils/ghe-restore-repositories-gist

diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-backup-es-hookshot b/share/github-backup-utils/ghe-backup-es-hookshot
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-backup-redis-cluster b/share/github-backup-utils/ghe-backup-redis-cluster
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
old mode 100644
new mode 100755
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
old mode 100644
new mode 100755

From 7cc66965637c22a11021c7b3ebea55cac7e80e15 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 9 Feb 2016 03:42:01 +0100
Subject: [PATCH 127/288] Bump Debian changelog

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 26e45dd09..cbac875e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+github-backup-utils (2.5.0) UNRELEASED; urgency=medium
+
+  * Adds GitHub Enterpise 2.5 support
+  * Adds GitHub Enterprise Cluster support
+  * Backups and restores SAML keypairs
+
+ -- Sergio Rubio <rubiojr@github.com>  Tue, 20 Oct 2015 00:02:37 +0000
+
 github-backup-utils (2.4.0) UNRELEASED; urgency=medium
 
   * Moves the in-progress detection to a separate file with PID which is

From 71efc055c44f7d6258b948b0a5d79d635af1e8ba Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 9 Feb 2016 19:35:44 +0100
Subject: [PATCH 128/288] Bump debian changelog date

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cbac875e1..1aaefd5cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ github-backup-utils (2.5.0) UNRELEASED; urgency=medium
   * Adds GitHub Enterprise Cluster support
   * Backups and restores SAML keypairs
 
- -- Sergio Rubio <rubiojr@github.com>  Tue, 20 Oct 2015 00:02:37 +0000
+ -- Sergio Rubio <rubiojr@github.com>  Tue, 9 Feb 2016 00:02:37 +0000
 
 github-backup-utils (2.4.0) UNRELEASED; urgency=medium
 

From 23c41cc215d51e6e6b743a452d8b16bab5013efa Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 9 Feb 2016 20:03:18 +0100
Subject: [PATCH 129/288] :lipstick: Debian changelog

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1aaefd5cb..fc9bbbefd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 github-backup-utils (2.5.0) UNRELEASED; urgency=medium
 
   * Adds GitHub Enterpise 2.5 support
-  * Adds GitHub Enterprise Cluster support
+  * Adds GitHub Enterprise Clustering support
   * Backups and restores SAML keypairs
 
  -- Sergio Rubio <rubiojr@github.com>  Tue, 9 Feb 2016 00:02:37 +0000

From 2308904635eacca3f8b09bd4933916f457d3a1b5 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 10 Feb 2016 17:05:05 +0100
Subject: [PATCH 130/288] Minor changes to the relase docs

Also added a new Makefile target that wraps the `script/package-deb`
script.
---
 Makefile     |  3 +++
 RELEASING.md | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 33528374e..136411a16 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ info:
 dist:
 	@script/package-tarball
 
+deb:
+	@script/package-deb
+
 clean:
 	rm -rf dist
 
diff --git a/RELEASING.md b/RELEASING.md
index 69a45cb41..692c74bfc 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -1,12 +1,13 @@
 # Making a backup-utils release
 
- 1. Add a new version and release notes to the `debian/changelog` file.
- 2. Rev the `share/github-backup-utils/version` file.
- 3. Tag the release: `git tag v2.0.2`
- 4. Build that tarball package: `make dist`
- 5. Install the debian devscripts package if necessary:
+ 1. Install the debian devscripts package:
     `sudo apt-get install devscripts`
- 6. Build the deb package: `debuild -uc -us`
- 7. Draft a new release at https://github.com/github/backup-utils/releases,
-    including the release notes and attaching the tarball and deb packages.
+ 2. Add a new version and release notes to the `debian/changelog` file:
+    `dch --newversion 2.6.0 --release-heuristic log`
+ 3. Rev the `share/github-backup-utils/version` file.
+ 4. Tag the release: `git tag v2.0.2`
+ 5. Build that tarball package: `make dist`
+ 6. Build the deb package: `make deb`. All the tests should pass.
+ 7. Draft a new release at https://github.com/github/backup-utils/releases, including the release notes and attaching the tarball and deb packages.
+    The dist tarball you should upload has the git revision in the file name, i.e. something like `github-backup-utils-v2.5.0-1-g23c41cc.tar.gz`
  8. Push the head of the release to the 'stable' branch.

From 251c13bb8a883be255b693b78e9f9d9c60813cad Mon Sep 17 00:00:00 2001
From: Melissa Smith <mellybess@users.noreply.github.com>
Date: Thu, 11 Feb 2016 17:06:12 -0800
Subject: [PATCH 131/288] add note on adding SSH to target instance

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bdd373901..819d32ca7 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ After the initial backup, use the following commands:
  - The `ghe-backup` command creates incremental snapshots of repository data,
    along with full snapshots of all other pertinent data stores.
  - The `ghe-restore` command restores snapshots to the same or separate GitHub
-   Enterprise appliance.
+   Enterprise appliance. You must add the backup host's SSH key to the target GitHub Enterprise appliance before using this command.
 
 ##### Example backup and restore usage
 

From bdeac3fa88b7b970be33742d88c2760c1c39a8ab Mon Sep 17 00:00:00 2001
From: Melissa Smith <mellybess@users.noreply.github.com>
Date: Thu, 11 Feb 2016 17:35:55 -0800
Subject: [PATCH 132/288] add line break

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 819d32ca7..d11838d3a 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,8 @@ After the initial backup, use the following commands:
  - The `ghe-backup` command creates incremental snapshots of repository data,
    along with full snapshots of all other pertinent data stores.
  - The `ghe-restore` command restores snapshots to the same or separate GitHub
-   Enterprise appliance. You must add the backup host's SSH key to the target GitHub Enterprise appliance before using this command.
+   Enterprise appliance. You must add the backup host's SSH key to the target
+    GitHub Enterprise appliance before using this command.
 
 ##### Example backup and restore usage
 

From 027359bc66710d8eeb8fe0c9ccf6cc5fe693f831 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Fri, 12 Feb 2016 02:45:20 +0100
Subject: [PATCH 133/288] :lipstick: format

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d11838d3a..dd143f167 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ After the initial backup, use the following commands:
    along with full snapshots of all other pertinent data stores.
  - The `ghe-restore` command restores snapshots to the same or separate GitHub
    Enterprise appliance. You must add the backup host's SSH key to the target
-    GitHub Enterprise appliance before using this command.
+   GitHub Enterprise appliance before using this command.
 
 ##### Example backup and restore usage
 

From d8e88ee9444837b997ea28fa2423cc67df6e8747 Mon Sep 17 00:00:00 2001
From: Tomoaki Nosaka <tomoaki.nosaka@gree.net>
Date: Wed, 11 Nov 2015 22:12:42 +0900
Subject: [PATCH 134/288] add GHE_EXTRA_RSYNC_OPTS variable for backup.config

---
 backup.config-example               | 4 ++++
 share/github-backup-utils/ghe-rsync | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/backup.config-example b/backup.config-example
index 17e43074a..fa7e1b0e7 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -27,6 +27,10 @@ GHE_NUM_SNAPSHOTS=10
 #
 #GHE_EXTRA_SSH_OPTS=""
 
+# Any extra options passed to the rsync command. Nothing required by default
+#
+#GHE_EXTRA_RSYNC_OPTS=""
+
 # Add s3 bucket for configuring which bucket to use in ghe-s3-backup and
 # ghe-s3-restore
 # GHE_S3_BUCKET=""
diff --git a/share/github-backup-utils/ghe-rsync b/share/github-backup-utils/ghe-rsync
index 7a234dccc..7b4151d54 100755
--- a/share/github-backup-utils/ghe-rsync
+++ b/share/github-backup-utils/ghe-rsync
@@ -7,11 +7,15 @@
 
 set -o pipefail
 
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
 # Filter vanished file warnings from both stdout (rsync versions < 3.x) and
 # stderr (rsync versions >= 3.x). The complex redirections are necessary to
 # filter stderr while also keeping stdout and stderr separated.
 IGNOREOUT='^(file has vanished: |rsync warning: some files vanished before they could be transferred)'
-(rsync "${@}" 3>&1 1>&2 2>&3 3>&- |
+(rsync $GHE_EXTRA_RSYNC_OPTS "${@}" 3>&1 1>&2 2>&3 3>&- |
   (egrep -v "$IGNOREOUT" || true)) 3>&1 1>&2 2>&3 3>&- |
   (egrep -v "$IGNOREOUT" || true)
 res=$?

From 2ca97c84ac7ecbef8eefbe98d395dc8666305fcb Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Thu, 18 Feb 2016 12:29:56 +1100
Subject: [PATCH 135/288] Update ghe-host-check to detect extra port 22 error

Treat `port 22: No route to host` errors from `ssh` the same as `port 22: Connection refused` errors.
---
 bin/ghe-host-check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 039ce168e..7d5833411 100755
--- a/bin/ghe-host-check
+++ b/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\|Connection timed out during banner exchange" >/dev/null; then
+            if echo "$output" | grep -i "port 22: connection refused\|port 22: no route to host\|Connection timed out during banner exchange" >/dev/null; then
                 exec "bin/$(basename $0)" "$hostname:122"
             fi
 

From f350b6fec34393d36c49e97d970f263271f40bd7 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Thu, 18 Feb 2016 14:07:22 -0800
Subject: [PATCH 136/288] clustering: Add notes for GHE_EXTRA_SSH_OPTS

---
 README.md             | 2 ++
 backup.config-example | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dd143f167..032d96723 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,8 @@ download the most recent GitHub Enterprise version.
     host name. Additional options are available and documented in the
     configuration file but none are required for basic backup functionality.
 
+    * In a clustering environment, the `GHE_EXTRA_SSH_OPTS` key must be configured.
+
  3. Add the backup host's SSH key to the GitHub appliance as an *Authorized SSH
     key*. See [Adding an SSH key for shell access][3] for instructions.
 
diff --git a/backup.config-example b/backup.config-example
index fa7e1b0e7..ab71140bc 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -23,11 +23,13 @@ GHE_NUM_SNAPSHOTS=10
 #
 #GHE_RESTORE_HOST="github-standby.example.com"
 
-# Any extra options passed to the SSH command.  Nothing required by default
+# Any extra options passed to the SSH command.
+# In a single instance environment, nothing is required by default.
+# In a clustering environment, "-i path-to-ssh-private-key" is required.
 #
 #GHE_EXTRA_SSH_OPTS=""
 
-# Any extra options passed to the rsync command. Nothing required by default
+# Any extra options passed to the rsync command. Nothing required by default.
 #
 #GHE_EXTRA_RSYNC_OPTS=""
 

From a5b27f357b8531f78ce8751d9519d90406ed68e4 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Thu, 18 Feb 2016 14:29:54 -0800
Subject: [PATCH 137/288] clustering: Explicitly use absolute path

---
 backup.config-example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backup.config-example b/backup.config-example
index ab71140bc..239c8d37b 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -25,7 +25,7 @@ GHE_NUM_SNAPSHOTS=10
 
 # Any extra options passed to the SSH command.
 # In a single instance environment, nothing is required by default.
-# In a clustering environment, "-i path-to-ssh-private-key" is required.
+# In a clustering environment, "-i abs-path-to-ssh-private-key" is required.
 #
 #GHE_EXTRA_SSH_OPTS=""
 

From 4cccc7bf70ff7033b2fceb836c503454c5d14b73 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Thu, 18 Feb 2016 15:46:13 -0800
Subject: [PATCH 138/288] clustering: Be explicit in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 032d96723..d29ba9e43 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ download the most recent GitHub Enterprise version.
     host name. Additional options are available and documented in the
     configuration file but none are required for basic backup functionality.
 
-    * In a clustering environment, the `GHE_EXTRA_SSH_OPTS` key must be configured.
+    * In a clustering environment, the `GHE_EXTRA_SSH_OPTS` key must be configured with the `-i <abs path to private key>` SSH option.
 
  3. Add the backup host's SSH key to the GitHub appliance as an *Authorized SSH
     key*. See [Adding an SSH key for shell access][3] for instructions.

From ab1bdda371d526850e773f93b74605443255f8e3 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 22 Feb 2016 20:26:58 +1100
Subject: [PATCH 139/288] Prevent multiple simultaneous restores

---
 bin/ghe-restore | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 53742873c..c4ca82a9b 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -146,10 +146,6 @@ fi
 echo "Starting restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
 ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
 
-# Update remote restore state file and setup failure trap
-trap "update_restore_status failed" EXIT
-update_restore_status "restoring"
-
 # Verify the host has been fully configured at least once if when running
 # against v11.10.x appliances and the -c option wasn't specified.
 if [ "$GHE_VERSION_MAJOR" -le 1 ] && ! $restore_settings && ! $instance_configured; then
@@ -176,6 +172,16 @@ if $instance_configured; then
     fi
 fi
 
+# Make sure the appliance doesn't already have a restore underway
+if [ "$GHE_VERSION_MAJOR" -ge 2 ] && ghe-ssh "$GHE_HOSTNAME" -- "sudo grep -q 'restoring' '$GHE_REMOTE_DATA_USER_DIR/common/ghe-restore-status' 2>/dev/null"; then
+    echo "Error: $GHE_HOSTNAME already has a restore underway. Aborting." 1>&2
+    exit 1
+fi
+
+# Update remote restore state file and setup failure trap
+trap "update_restore_status failed" EXIT
+update_restore_status "restoring"
+
 # Restore settings and license if restoring to an unconfigured appliance or when
 # specified manually.
 if $restore_settings; then

From a4ab951b0325263863bc39b0ffa1efa325a22228 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 22 Feb 2016 20:57:42 +1100
Subject: [PATCH 140/288] Tests for simultaneous restores

---
 test/test-ghe-restore.sh | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 5ca5e5f0f..f761d0f85 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -410,3 +410,37 @@ begin_test "ghe-restore with tarball strategy"
     echo "$output" | grep -q 'fake ghe-export-repositories data'
 )
 end_test
+
+begin_test "ghe-restore aborts when another restore is underway"
+(
+    set -e
+    # This test is only valid for version 2 and above
+    if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+      rm -rf "$GHE_REMOTE_ROOT_DIR"
+      setup_remote_metadata
+
+      # create file used to determine if instance has been configured.
+      touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
+
+      # create file used to determine if instance is in maintenance mode.
+      mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
+      touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
+      # create file to indicate restore is underway
+      echo "restoring" > "$GHE_REMOTE_DATA_USER_DIR/common/ghe-restore-status"
+
+      # set restore host environ var
+      GHE_RESTORE_HOST=127.0.0.1
+      export GHE_RESTORE_HOST
+
+      # run ghe-restore and write output to file for asserting against
+      # this should fail due to the appliance being in an unconfigured state
+      ! ghe-restore -v > "$TRASHDIR/restore-out" 2>&1
+
+      cat $TRASHDIR/restore-out
+
+      # verify that ghe-restore failed due to the appliance not being configured
+      grep -q -e "already has a restore underway" "$TRASHDIR/restore-out"
+    fi
+)
+end_test

From 2143e95daf97b2517514c242b32a769d29693950 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 22 Feb 2016 21:18:10 +1100
Subject: [PATCH 141/288] Fix test comment

---
 test/test-ghe-restore.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index f761d0f85..b467eaf4e 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -439,7 +439,7 @@ begin_test "ghe-restore aborts when another restore is underway"
 
       cat $TRASHDIR/restore-out
 
-      # verify that ghe-restore failed due to the appliance not being configured
+      # verify that ghe-restore failed due a restore already being underway
       grep -q -e "already has a restore underway" "$TRASHDIR/restore-out"
     fi
 )

From f77595b8063a4f3338c614f255dbbdb7aaa84689 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 22 Feb 2016 21:33:02 +1100
Subject: [PATCH 142/288] Minor style tidy up

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index c4ca82a9b..b7776ee9d 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -173,7 +173,7 @@ if $instance_configured; then
 fi
 
 # Make sure the appliance doesn't already have a restore underway
-if [ "$GHE_VERSION_MAJOR" -ge 2 ] && ghe-ssh "$GHE_HOSTNAME" -- "sudo grep -q 'restoring' '$GHE_REMOTE_DATA_USER_DIR/common/ghe-restore-status' 2>/dev/null"; then
+if [ "$GHE_VERSION_MAJOR" -ge 2 ] && ghe-ssh "$GHE_HOSTNAME" -- "sudo grep -q restoring $GHE_REMOTE_DATA_USER_DIR/common/ghe-restore-status 2>/dev/null"; then
     echo "Error: $GHE_HOSTNAME already has a restore underway. Aborting." 1>&2
     exit 1
 fi

From 0925b39ef602669903dd3517c0ad890e265f5294 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Tue, 23 Feb 2016 10:01:59 -0800
Subject: [PATCH 143/288] Remove experimental s3 support

---
 backup.config-example                    |  4 ----
 share/github-backup-utils/ghe-s3-backup  | 26 ------------------------
 share/github-backup-utils/ghe-s3-restore | 22 --------------------
 3 files changed, 52 deletions(-)
 delete mode 100755 share/github-backup-utils/ghe-s3-backup
 delete mode 100755 share/github-backup-utils/ghe-s3-restore

diff --git a/backup.config-example b/backup.config-example
index 239c8d37b..89dd3ce85 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -32,7 +32,3 @@ GHE_NUM_SNAPSHOTS=10
 # Any extra options passed to the rsync command. Nothing required by default.
 #
 #GHE_EXTRA_RSYNC_OPTS=""
-
-# Add s3 bucket for configuring which bucket to use in ghe-s3-backup and
-# ghe-s3-restore
-# GHE_S3_BUCKET=""
diff --git a/share/github-backup-utils/ghe-s3-backup b/share/github-backup-utils/ghe-s3-backup
deleted file mode 100755
index 63501a793..000000000
--- a/share/github-backup-utils/ghe-s3-backup
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#/ Usage: ghe-s3-backup-all
-#/ Take snapshots of all GitHub Enterprise data, including the mysql database
-#/ and backup to S3.
-set -e
-
-# Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
-
-if [ -e $HOME/.s3cfg ]; then
-  echo "Using existing ~/.s3cfg ..."
-else
-  # Configure s3cmd if there isn't a config file already.
-  s3cmd --configure
-fi
-
-# Run the backup script.
-ghe-backup
-
-# Create the bucket if it doesn't exist.
-s3cmd mb s3://$GHE_S3_BUCKET
-
-# Upload to S3.
-# --delete-removed is to delete items in s3 that have been removed on the host
-s3cmd sync --delete-removed "$GHE_DATA_DIR"/current/ s3://$GHE_S3_BUCKET
diff --git a/share/github-backup-utils/ghe-s3-restore b/share/github-backup-utils/ghe-s3-restore
deleted file mode 100755
index 2554da8da..000000000
--- a/share/github-backup-utils/ghe-s3-restore
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#/ Usage: ghe-s3-restore
-#/ Restores backup files from S3.
-set -e
-
-# Bring in the backup configuration.
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
-
-if [ -e $HOME/.s3cfg ]; then
-  echo "Using existing ~/.s3cfg ..."
-else
-  # Configure s3cmd if there isn't a config file already.
-  s3cmd --configure
-fi
-
-# Restore from S3 into a new snapshot directory.
-mkdir -p "$GHE_SNAPSHOT_DIR"
-s3cmd --preserve get s3://$GHE_S3_BUCKET/* "$GHE_SNAPSHOT_DIR"
-
-# Run the restore script.
-ghe-restore -s "$GHE_SNAPSHOT_DIR"

From 6c5dc101d566dfdc66e97918f1e9e1442c4d1e01 Mon Sep 17 00:00:00 2001
From: Keeran Raj Hawoldar <keeran@github.com>
Date: Tue, 23 Feb 2016 23:31:17 +0000
Subject: [PATCH 144/288] Highlight symlink importance in snapshots

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index d29ba9e43..4c53d0845 100644
--- a/README.md
+++ b/README.md
@@ -210,6 +210,11 @@ date and time the snapshot was taken. Each snapshot directory contains a full
 backup snapshot of all relevant data stores. Repository, Search, and Pages data
 is stored efficiently via hard links.
 
+*Please note* Symlinks must be maintained when archiving backup snapshots.
+Dereferencing or excluding symlinks, or storing the snapshot contents on a 
+filesystem which does not support symlinks (e.g. Amazon S3) will result in operational 
+problems when the data is restored.
+
 The following example shows a snapshot file hierarchy for hourly frequency.
 There are five snapshot directories, with the `current` symlink pointing to the
 most recent successful snapshot:

From 777bb4e66af904c6ac11cf73fc7c58ba87522334 Mon Sep 17 00:00:00 2001
From: Keeran Raj Hawoldar <keeran@github.com>
Date: Wed, 24 Feb 2016 00:24:48 +0000
Subject: [PATCH 145/288] Remove unnecessary S3 reference

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4c53d0845..9fcb034f2 100644
--- a/README.md
+++ b/README.md
@@ -212,7 +212,7 @@ is stored efficiently via hard links.
 
 *Please note* Symlinks must be maintained when archiving backup snapshots.
 Dereferencing or excluding symlinks, or storing the snapshot contents on a 
-filesystem which does not support symlinks (e.g. Amazon S3) will result in operational 
+filesystem which does not support symlinks will result in operational 
 problems when the data is restored.
 
 The following example shows a snapshot file hierarchy for hourly frequency.

From 540460bbe63c15444067573af7d68b4f69108973 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 24 Feb 2016 16:24:05 +1100
Subject: [PATCH 146/288] Fix logging output

---
 bin/ghe-backup  | 2 +-
 bin/ghe-restore | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 564597dfe..5b990db27 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -94,7 +94,7 @@ if ghe-ssh "$GHE_HOSTNAME" -- \
 fi
 
 # Log backup start message in /var/log/syslog on remote instance
-ghe_remote_logger "Starting backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
+ghe_remote_logger "Starting backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
 
 # Determine whether to use the rsync or tarball backup strategy based on the
 # remote appliance version. The tarball strategy must be used with GitHub
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 53742873c..9d427fff5 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -144,7 +144,7 @@ fi
 
 # Log restore start message locally and in /var/log/syslog on remote instance
 echo "Starting restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
-ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
+ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT ..."
 
 # Update remote restore state file and setup failure trap
 trap "update_restore_status failed" EXIT
@@ -275,7 +275,7 @@ trap "" EXIT
 update_restore_status "complete"
 
 # Log restore complete message in /var/log/syslog on remote instance
-ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_SNAPSHOT_TIMESTAMP}."
+ghe_remote_logger "Completed restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT successfully."
 
 if ! $cluster; then
   echo "Restoring SSH host keys ..."

From 50f34334cfda8d57a1f16a7d94c1558556eecf09 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 24 Feb 2016 17:54:01 +1100
Subject: [PATCH 147/288] Remote logging wording

---
 bin/ghe-backup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 5b990db27..5b297d7b2 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -94,7 +94,7 @@ if ghe-ssh "$GHE_HOSTNAME" -- \
 fi
 
 # Log backup start message in /var/log/syslog on remote instance
-ghe_remote_logger "Starting backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
+ghe_remote_logger "Starting backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
 
 # Determine whether to use the rsync or tarball backup strategy based on the
 # remote appliance version. The tarball strategy must be used with GitHub
@@ -213,10 +213,10 @@ echo "Completed backup of $GHE_HOSTNAME in snapshot $GHE_SNAPSHOT_TIMESTAMP at $
 
 # Exit non-zero and list the steps that failed.
 if [ -z "$failures" ]; then
-    ghe_remote_logger "Completed backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP successfully."
+    ghe_remote_logger "Completed backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP successfully."
 else
     steps="$(echo $failures | sed 's/ /, /g')"
-    ghe_remote_logger "Completed backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP with failures: ${steps}."
+    ghe_remote_logger "Completed backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP with failures: ${steps}."
     echo "Error: Snapshot incomplete. Some steps failed: ${steps}. "
     exit 1
 fi

From 5fec8c0223dba3458820a6a238928517cf7625a3 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Tue, 23 Feb 2016 22:57:09 -0800
Subject: [PATCH 148/288] Use consistent logging format as ghe-backup

---
 bin/ghe-restore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 9d427fff5..0244d5c51 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -144,7 +144,7 @@ fi
 
 # Log restore start message locally and in /var/log/syslog on remote instance
 echo "Starting restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
-ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT ..."
+ghe_remote_logger "Starting restore from $(hostname) in snapshot $GHE_RESTORE_SNAPSHOT ..."
 
 # Update remote restore state file and setup failure trap
 trap "update_restore_status failed" EXIT
@@ -275,7 +275,7 @@ trap "" EXIT
 update_restore_status "complete"
 
 # Log restore complete message in /var/log/syslog on remote instance
-ghe_remote_logger "Completed restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT successfully."
+ghe_remote_logger "Completed restore from $(hostname) in snapshot $GHE_RESTORE_SNAPSHOT successfully."
 
 if ! $cluster; then
   echo "Restoring SSH host keys ..."

From 8c7cbe7bf201702af5e4cc3834ace4e436672e52 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Thu, 25 Feb 2016 09:41:57 +1100
Subject: [PATCH 149/288] Revert log message format

---
 bin/ghe-backup  | 4 ++--
 bin/ghe-restore | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 5b297d7b2..564597dfe 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -213,10 +213,10 @@ echo "Completed backup of $GHE_HOSTNAME in snapshot $GHE_SNAPSHOT_TIMESTAMP at $
 
 # Exit non-zero and list the steps that failed.
 if [ -z "$failures" ]; then
-    ghe_remote_logger "Completed backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP successfully."
+    ghe_remote_logger "Completed backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP successfully."
 else
     steps="$(echo $failures | sed 's/ /, /g')"
-    ghe_remote_logger "Completed backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP with failures: ${steps}."
+    ghe_remote_logger "Completed backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP with failures: ${steps}."
     echo "Error: Snapshot incomplete. Some steps failed: ${steps}. "
     exit 1
 fi
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 0244d5c51..52b650138 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -144,7 +144,7 @@ fi
 
 # Log restore start message locally and in /var/log/syslog on remote instance
 echo "Starting restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
-ghe_remote_logger "Starting restore from $(hostname) in snapshot $GHE_RESTORE_SNAPSHOT ..."
+ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT ..."
 
 # Update remote restore state file and setup failure trap
 trap "update_restore_status failed" EXIT
@@ -275,7 +275,7 @@ trap "" EXIT
 update_restore_status "complete"
 
 # Log restore complete message in /var/log/syslog on remote instance
-ghe_remote_logger "Completed restore from $(hostname) in snapshot $GHE_RESTORE_SNAPSHOT successfully."
+ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_RESTORE_SNAPSHOT}."
 
 if ! $cluster; then
   echo "Restoring SSH host keys ..."

From f36f431386c3128512566a25040fa5f1bdf17dae Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 16 Feb 2016 17:28:25 +0100
Subject: [PATCH 150/288] Ignore archived gists

The server will send a gist-not-found line when the gist is not in the
gists database table.
---
 share/github-backup-utils/ghe-restore-repositories-gist | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index a4337bcce..07eafa0ed 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -85,6 +85,11 @@ for gist_path in $gist_paths; do
   echo "$gist_id" >&4
   read routes < ssh_routes_in
 
+  if [ "$routes" = 'gist-not-found' ]; then
+    echo "  Warning: gist $gist_id not found in the database (deleted?), ignoring."
+    continue
+  fi
+
   for route in $routes; do
     ghe-rsync -aHR --delete \
       -e "ssh -q $opts -p $port -F $config_file -l $user" \

From 716e792f291c28bb72c9dcd6e56efd9c6d037cfc Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 22 Feb 2016 13:58:43 +0100
Subject: [PATCH 151/288] Ignore invalid page IDs

Needs https://github.com/github/github/pull/51274
---
 share/github-backup-utils/ghe-restore-pages-dpages | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
index ff2746f47..e22fa31de 100755
--- a/share/github-backup-utils/ghe-restore-pages-dpages
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -85,6 +85,11 @@ for pages_path in $pages_paths; do
   echo "$page_id" >&4
   read routes < ssh_routes_in
 
+  if [ "$routes" = 'page-id-not-found' ]; then
+    echo "  Warning: page ID $page_id not found in the database, ignoring."
+    continue
+  fi
+
   for route in $routes; do
     ghe-rsync -aHR --delete \
       -e "ssh -q $opts -p $port -F $config_file -l $user" \

From 5aa5f6dd9337aa387d316484f1537ec21cb752c1 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 23 Feb 2016 12:00:54 +0100
Subject: [PATCH 152/288] Read output from storage-cluster-import-finalize

Needs #XXXXX
---
 share/github-backup-utils/ghe-restore-alambic-cluster | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index 368c545e3..c91b9e731 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -108,14 +108,15 @@ for storage_path in $storage_paths; do
   done
 
   echo "$oid $routes" >&5
+  read output < ssh_finalize_in
 done
 
 exec 4>&-
 exec 5>&-
 
 # Ensure to flush these and close the pipes
-cat ssh_routes_in > /dev/null
-cat ssh_finalize_in > /dev/null
+cat ssh_routes_in > /dev/null &
+cat ssh_finalize_in > /dev/null &
 
 wait $ssh_routes_pid > /dev/null 1>&2 || true
 wait $ssh_finalize_pid > /dev/null 1>&2 || true

From fd8d9de2f13156b576acdda8fa9224c21395b853 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 23 Feb 2016 14:18:03 +0100
Subject: [PATCH 153/288] Add ServerAliveInterval

Mostly for consistency with other scripts.
---
 share/github-backup-utils/ghe-restore-alambic-cluster | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index c91b9e731..a20998a6b 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -47,6 +47,7 @@ hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname |
 for hostname in $hostnames; do
   config="$config
 Host $hostname
+  ServerAliveInterval 60
   ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
 done
 

From c94486190f2e0f0880d7490e8356d6fae729af5e Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 24 Feb 2016 14:28:27 +0100
Subject: [PATCH 154/288] ssh_finalize_in pipe not required

Also fixed some stderr redirections.
---
 .../github-backup-utils/ghe-restore-alambic-cluster | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index a20998a6b..a20f5f6b5 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -60,22 +60,21 @@ cleanup() {
   for pid in $(jobs -p); do
     kill -KILL $pid > /dev/null 1>&2 || true
   done
-  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_out
 }
 
 trap 'cleanup' INT TERM EXIT
 
-rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+rm -rf ssh_routes_in ssh_routes_out ssh_finalize_out
 mkfifo ssh_routes_in
 mkfifo ssh_routes_out
-mkfifo ssh_finalize_in
 mkfifo ssh_finalize_out
 
 echo "Setting up storage processes"
 
 ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-routes - < ssh_routes_out > ssh_routes_in &
 ssh_routes_pid=$!
-ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-finalize - < ssh_finalize_out > ssh_finalize_in &
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-finalize - < ssh_finalize_out &
 ssh_finalize_pid=$!
 
 echo "Set up storage processes"
@@ -109,7 +108,6 @@ for storage_path in $storage_paths; do
   done
 
   echo "$oid $routes" >&5
-  read output < ssh_finalize_in
 done
 
 exec 4>&-
@@ -117,7 +115,6 @@ exec 5>&-
 
 # Ensure to flush these and close the pipes
 cat ssh_routes_in > /dev/null &
-cat ssh_finalize_in > /dev/null &
 
-wait $ssh_routes_pid > /dev/null 1>&2 || true
-wait $ssh_finalize_pid > /dev/null 1>&2 || true
+wait $ssh_routes_pid > /dev/null 2>&1 || true
+wait $ssh_finalize_pid > /dev/null 2>&1 || true

From 0b1c4d0ace1575f332ba86b282982fbe166147d1 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 25 Feb 2016 18:15:01 +0100
Subject: [PATCH 155/288] Clustering: ghe-restore fixes

More robust restores when restoring gists, pages and storage data into a
cluster.
---
 .../ghe-restore-alambic-cluster                   | 15 +++++++--------
 .../github-backup-utils/ghe-restore-pages-dpages  |  5 +++++
 .../ghe-restore-repositories-gist                 |  5 +++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index 368c545e3..a20f5f6b5 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -47,6 +47,7 @@ hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname |
 for hostname in $hostnames; do
   config="$config
 Host $hostname
+  ServerAliveInterval 60
   ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
 done
 
@@ -59,22 +60,21 @@ cleanup() {
   for pid in $(jobs -p); do
     kill -KILL $pid > /dev/null 1>&2 || true
   done
-  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+  rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_out
 }
 
 trap 'cleanup' INT TERM EXIT
 
-rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
+rm -rf ssh_routes_in ssh_routes_out ssh_finalize_out
 mkfifo ssh_routes_in
 mkfifo ssh_routes_out
-mkfifo ssh_finalize_in
 mkfifo ssh_finalize_out
 
 echo "Setting up storage processes"
 
 ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-routes - < ssh_routes_out > ssh_routes_in &
 ssh_routes_pid=$!
-ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-finalize - < ssh_finalize_out > ssh_finalize_in &
+ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-finalize - < ssh_finalize_out &
 ssh_finalize_pid=$!
 
 echo "Set up storage processes"
@@ -114,8 +114,7 @@ exec 4>&-
 exec 5>&-
 
 # Ensure to flush these and close the pipes
-cat ssh_routes_in > /dev/null
-cat ssh_finalize_in > /dev/null
+cat ssh_routes_in > /dev/null &
 
-wait $ssh_routes_pid > /dev/null 1>&2 || true
-wait $ssh_finalize_pid > /dev/null 1>&2 || true
+wait $ssh_routes_pid > /dev/null 2>&1 || true
+wait $ssh_finalize_pid > /dev/null 2>&1 || true
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
index ff2746f47..e22fa31de 100755
--- a/share/github-backup-utils/ghe-restore-pages-dpages
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -85,6 +85,11 @@ for pages_path in $pages_paths; do
   echo "$page_id" >&4
   read routes < ssh_routes_in
 
+  if [ "$routes" = 'page-id-not-found' ]; then
+    echo "  Warning: page ID $page_id not found in the database, ignoring."
+    continue
+  fi
+
   for route in $routes; do
     ghe-rsync -aHR --delete \
       -e "ssh -q $opts -p $port -F $config_file -l $user" \
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index a4337bcce..07eafa0ed 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -85,6 +85,11 @@ for gist_path in $gist_paths; do
   echo "$gist_id" >&4
   read routes < ssh_routes_in
 
+  if [ "$routes" = 'gist-not-found' ]; then
+    echo "  Warning: gist $gist_id not found in the database (deleted?), ignoring."
+    continue
+  fi
+
   for route in $routes; do
     ghe-rsync -aHR --delete \
       -e "ssh -q $opts -p $port -F $config_file -l $user" \

From 11385242fcf4e60f9aebdede3a018b59158c2088 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 25 Feb 2016 18:19:56 +0100
Subject: [PATCH 156/288] Consistent warning message

---
 share/github-backup-utils/ghe-restore-repositories-gist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index 07eafa0ed..a76866b06 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -86,7 +86,7 @@ for gist_path in $gist_paths; do
   read routes < ssh_routes_in
 
   if [ "$routes" = 'gist-not-found' ]; then
-    echo "  Warning: gist $gist_id not found in the database (deleted?), ignoring."
+    echo "  Warning: gist $gist_id not found in the database, ignoring."
     continue
   fi
 

From 011bdd8f0ddc488abd7607b4e563fffc29cbace8 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 25 Feb 2016 18:47:49 +0100
Subject: [PATCH 157/288] :lipstick: warning message

---
 share/github-backup-utils/ghe-restore-repositories-gist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index a76866b06..ea399e786 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -86,7 +86,7 @@ for gist_path in $gist_paths; do
   read routes < ssh_routes_in
 
   if [ "$routes" = 'gist-not-found' ]; then
-    echo "  Warning: gist $gist_id not found in the database, ignoring."
+    echo "  Warning: gist ID $gist_id not found in the database, ignoring."
     continue
   fi
 

From 0a078b4a598e639d32fa6e4c2f395deaa2fb745d Mon Sep 17 00:00:00 2001
From: Sergio Rubio <sergio.rubio@github.com>
Date: Thu, 25 Feb 2016 19:50:53 +0100
Subject: [PATCH 158/288] Revert "Prevent multiple restores from running at the
 same time"

---
 bin/ghe-restore          | 14 ++++----------
 test/test-ghe-restore.sh | 34 ----------------------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 0ba3ff90d..52b650138 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -146,6 +146,10 @@ fi
 echo "Starting restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
 ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT ..."
 
+# Update remote restore state file and setup failure trap
+trap "update_restore_status failed" EXIT
+update_restore_status "restoring"
+
 # Verify the host has been fully configured at least once if when running
 # against v11.10.x appliances and the -c option wasn't specified.
 if [ "$GHE_VERSION_MAJOR" -le 1 ] && ! $restore_settings && ! $instance_configured; then
@@ -172,16 +176,6 @@ if $instance_configured; then
     fi
 fi
 
-# Make sure the appliance doesn't already have a restore underway
-if [ "$GHE_VERSION_MAJOR" -ge 2 ] && ghe-ssh "$GHE_HOSTNAME" -- "sudo grep -q restoring $GHE_REMOTE_DATA_USER_DIR/common/ghe-restore-status 2>/dev/null"; then
-    echo "Error: $GHE_HOSTNAME already has a restore underway. Aborting." 1>&2
-    exit 1
-fi
-
-# Update remote restore state file and setup failure trap
-trap "update_restore_status failed" EXIT
-update_restore_status "restoring"
-
 # Restore settings and license if restoring to an unconfigured appliance or when
 # specified manually.
 if $restore_settings; then
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index b467eaf4e..5ca5e5f0f 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -410,37 +410,3 @@ begin_test "ghe-restore with tarball strategy"
     echo "$output" | grep -q 'fake ghe-export-repositories data'
 )
 end_test
-
-begin_test "ghe-restore aborts when another restore is underway"
-(
-    set -e
-    # This test is only valid for version 2 and above
-    if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-      rm -rf "$GHE_REMOTE_ROOT_DIR"
-      setup_remote_metadata
-
-      # create file used to determine if instance has been configured.
-      touch "$GHE_REMOTE_ROOT_DIR/etc/github/configured"
-
-      # create file used to determine if instance is in maintenance mode.
-      mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
-      touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
-
-      # create file to indicate restore is underway
-      echo "restoring" > "$GHE_REMOTE_DATA_USER_DIR/common/ghe-restore-status"
-
-      # set restore host environ var
-      GHE_RESTORE_HOST=127.0.0.1
-      export GHE_RESTORE_HOST
-
-      # run ghe-restore and write output to file for asserting against
-      # this should fail due to the appliance being in an unconfigured state
-      ! ghe-restore -v > "$TRASHDIR/restore-out" 2>&1
-
-      cat $TRASHDIR/restore-out
-
-      # verify that ghe-restore failed due a restore already being underway
-      grep -q -e "already has a restore underway" "$TRASHDIR/restore-out"
-    fi
-)
-end_test

From 02b4552675a1dc3d4e8298a0c23f108c6887cc55 Mon Sep 17 00:00:00 2001
From: Ben Gollmer <jatoben@github.com>
Date: Thu, 25 Feb 2016 14:42:23 -0700
Subject: [PATCH 159/288] Ask for index field instead of using cut

---
 share/github-backup-utils/ghe-backup-es-audit-log | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index 7ef6e40e3..c67e7c7dd 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -19,7 +19,7 @@ ghe_remote_version_required "$host"
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/audit-log"
 
-indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/audit_log*"' | cut -d ' ' -f 3)
+indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/audit_log*?h=index"') || true
 current_index=audit_log-$(ghe-ssh "$host" 'date +"%Y-%m"')
 
 for index in $indices; do

From 061905edcef6a03f62284c1e28c152d7f43bf734 Mon Sep 17 00:00:00 2001
From: Ben Gollmer <jatoben@github.com>
Date: Thu, 25 Feb 2016 16:09:03 -0700
Subject: [PATCH 160/288] Return empty index list for ghe-backup-es-audit-log

---
 test/bin/curl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/bin/curl b/test/bin/curl
index 64545c39a..d1234b872 100755
--- a/test/bin/curl
+++ b/test/bin/curl
@@ -3,6 +3,11 @@
 # Fake curl command stub for tests.
 set -e
 
+# Return empty list of indexes for ghe-backup-es-audit-log
+if echo "$@" | grep -q '_cat/indices/audit_log\*?h=index$'; then
+  exit 0
+fi
+
 # Write args to stdout
 echo "$@"
 

From d4c6de828bf0f167696ca4ba739f955dab109574 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 26 Feb 2016 20:23:42 +1100
Subject: [PATCH 161/288] Use .sync_in_progress lock file during restore

---
 .../ghe-restore-repositories-rsync            | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index d0ae56aeb..b99c74756 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -19,13 +19,52 @@ GHE_HOSTNAME="$1"
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
 
+# Remote sync-in-progress file location. When this file exists, Git GC
+# operations are disabled on the GitHub instance.
+sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
+
 # The snapshot to restore should be set by the ghe-restore command but this lets
 # us run this script directly.
 : ${GHE_RESTORE_SNAPSHOT:=current}
 
+# Removes the remote sync-in-progress file on exit, re-enabling GC operations
+# on the remote instance.
+cleanup() {
+    ghe-ssh "$GHE_HOSTNAME" -- "sudo rm -f '$sync_in_progress_file'"
+}
+trap 'cleanup' EXIT
+trap 'exit $?' INT # ^C always terminate
+
+# Touch the sync-in-progress file, disabling GC operations, and wait for all
+# active GC processes to finish on the remote side.
+echo "
+    set -e
+    sudo -u git touch '$sync_in_progress_file'
+
+    sanity=0
+    while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
+        # note: the bracket synta[x] below is to prevent matches against the
+        # grep process itself.
+        if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
+            sleep 1
+            sanity=\$(( sanity + 1 ))
+        else
+            exit 0
+        fi
+    done
+    exit 7
+" | ghe-ssh "$GHE_HOSTNAME" -- /bin/sh || {
+    res=$?
+    if [ $res = 7 ]; then
+        echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds. Aborting..." 1>&2
+    fi
+    exit $res
+}
+
 # Transfer all git repository data from the latest snapshot to the GitHub
 # instance in a single rsync invocation.
 ghe-rsync -avH --delete \
+    --exclude ".sync_in_progress" \
     -e "ghe-ssh -p $(ssh_port_part "$GHE_HOSTNAME")" \
     --rsync-path="sudo -u git rsync" \
     "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/" \

From a89ec70c61377904a643fea1f0a13241617c87b5 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 29 Feb 2016 13:18:52 +0100
Subject: [PATCH 162/288] Exit 1 if ssh/curl fail to retrieve the indices

---
 share/github-backup-utils/ghe-backup-es-audit-log | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index c67e7c7dd..014b66fb9 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -19,7 +19,11 @@ ghe_remote_version_required "$host"
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/audit-log"
 
-indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/audit_log*?h=index"') || true
+if ! indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/audit_log*?h=index"'); then
+  echo "Error: failed to retrieve audit log indices." 1>&2
+  exit 1
+fi
+
 current_index=audit_log-$(ghe-ssh "$host" 'date +"%Y-%m"')
 
 for index in $indices; do

From 5e3c9096d6fa7653136a3f9965ee0639d7670817 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 1 Mar 2016 17:44:55 +1100
Subject: [PATCH 163/288] Change to bash

---
 README.md                                                  | 6 +++---
 bin/ghe-backup                                             | 2 +-
 bin/ghe-host-check                                         | 2 +-
 bin/ghe-restore                                            | 2 +-
 script/cibuild                                             | 2 +-
 script/package-deb                                         | 2 +-
 script/package-tarball                                     | 2 +-
 share/github-backup-utils/ghe-backup-alambic-cluster       | 2 +-
 share/github-backup-utils/ghe-backup-config                | 2 +-
 share/github-backup-utils/ghe-backup-es-audit-log          | 2 +-
 share/github-backup-utils/ghe-backup-es-hookshot           | 2 +-
 share/github-backup-utils/ghe-backup-es-rsync              | 2 +-
 share/github-backup-utils/ghe-backup-es-tarball            | 2 +-
 share/github-backup-utils/ghe-backup-pages-cluster         | 2 +-
 share/github-backup-utils/ghe-backup-pages-rsync           | 2 +-
 share/github-backup-utils/ghe-backup-pages-tarball         | 2 +-
 share/github-backup-utils/ghe-backup-redis                 | 2 +-
 share/github-backup-utils/ghe-backup-redis-cluster         | 2 +-
 share/github-backup-utils/ghe-backup-repositories-cluster  | 2 +-
 share/github-backup-utils/ghe-backup-repositories-rsync    | 2 +-
 share/github-backup-utils/ghe-backup-repositories-tarball  | 2 +-
 share/github-backup-utils/ghe-backup-settings              | 2 +-
 share/github-backup-utils/ghe-backup-userdata              | 2 +-
 share/github-backup-utils/ghe-maintenance-mode-disable     | 2 +-
 share/github-backup-utils/ghe-maintenance-mode-enable      | 2 +-
 share/github-backup-utils/ghe-maintenance-mode-status      | 2 +-
 share/github-backup-utils/ghe-prune-snapshots              | 2 +-
 share/github-backup-utils/ghe-restore-es-audit-log         | 2 +-
 share/github-backup-utils/ghe-restore-es-rsync             | 2 +-
 share/github-backup-utils/ghe-restore-es-tarball           | 2 +-
 share/github-backup-utils/ghe-restore-pages-rsync          | 2 +-
 share/github-backup-utils/ghe-restore-pages-tarball        | 2 +-
 share/github-backup-utils/ghe-restore-repositories-rsync   | 2 +-
 share/github-backup-utils/ghe-restore-repositories-tarball | 2 +-
 share/github-backup-utils/ghe-restore-settings             | 2 +-
 share/github-backup-utils/ghe-restore-snapshot-path        | 2 +-
 share/github-backup-utils/ghe-restore-userdata             | 2 +-
 share/github-backup-utils/ghe-ssh                          | 2 +-
 test/bin/chown                                             | 2 +-
 test/bin/curl                                              | 2 +-
 test/bin/enterprise-configure                              | 2 +-
 test/bin/ghe-config-apply                                  | 2 +-
 test/bin/ghe-es-snapshot                                   | 2 +-
 test/bin/ghe-fake-export-command                           | 2 +-
 test/bin/ghe-fake-import-command                           | 2 +-
 test/bin/ghe-maintenance                                   | 2 +-
 test/bin/ghe-service-ensure-elasticsearch                  | 2 +-
 test/bin/ghe-service-ensure-mysql                          | 2 +-
 test/bin/ionice-stub                                       | 2 +-
 test/bin/python                                            | 2 +-
 test/bin/redis-cli                                         | 2 +-
 test/bin/ssh                                               | 2 +-
 test/test-bashisms.sh                                      | 2 +-
 test/test-ghe-backup-config.sh                             | 2 +-
 test/test-ghe-backup-repositories-rsync-nw.sh              | 2 +-
 test/test-ghe-backup-repositories-rsync.sh                 | 2 +-
 test/test-ghe-backup.sh                                    | 2 +-
 test/test-ghe-host-check.sh                                | 2 +-
 test/test-ghe-prune-snapshots.sh                           | 2 +-
 test/test-ghe-restore.sh                                   | 2 +-
 test/test-ghe-ssh.sh                                       | 2 +-
 test/testlib.sh                                            | 2 +-
 62 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/README.md b/README.md
index 9fcb034f2..1f527009a 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ storage and must have network connectivity with the GitHub Enterprise appliance.
 ##### Backup host requirements
 
 Backup host software requirements are modest: Linux or other modern Unix
-operating system with [rsync][4] v2.6.4 or newer.
+operating system with bash and [rsync][4] v2.6.4 or newer.
 
 The backup host must be able to establish network connections outbound to the
 GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise 2.0 or newer instances, and TCP port 22 is used for older versions (11.10.34X).
@@ -211,8 +211,8 @@ backup snapshot of all relevant data stores. Repository, Search, and Pages data
 is stored efficiently via hard links.
 
 *Please note* Symlinks must be maintained when archiving backup snapshots.
-Dereferencing or excluding symlinks, or storing the snapshot contents on a 
-filesystem which does not support symlinks will result in operational 
+Dereferencing or excluding symlinks, or storing the snapshot contents on a
+filesystem which does not support symlinks will result in operational
 problems when the data is restored.
 
 The following example shows a snapshot file hierarchy for hourly frequency.
diff --git a/bin/ghe-backup b/bin/ghe-backup
index 564597dfe..39048db1e 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup [-v]
 #/ Take snapshots of all GitHub Enterprise data, including Git repository data,
 #/ the MySQL database, instance settings, GitHub Pages data, etc.
diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 7d5833411..b75a3b59d 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-host-check [<host>]
 #/ Verify connectivity with the GitHub Enterprise host. When no <host> is
 #/ provided, the $GHE_HOSTNAME configured in backup.config is assumed.
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 52b650138..7146de8ec 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore [-v] [-s <snapshot-id>] [<host>]
 #/ Restores a GitHub instance from local backup snapshots. The <host> is the
 #/ hostname or IP of the GitHub instance. The <host> may be omitted when
diff --git a/script/cibuild b/script/cibuild
index 553a8d035..28839c30c 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: script/cibuild [--no-package]
 set -e
 
diff --git a/script/package-deb b/script/package-deb
index 6e3d9e829..b42f0d5fd 100755
--- a/script/package-deb
+++ b/script/package-deb
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: script/package-deb
 # Script to build a deb release package from the current HEAD version.
 # The package version comes from the debian/changelog file so that should
diff --git a/script/package-tarball b/script/package-tarball
index 6229cc33d..65f4ed51d 100755
--- a/script/package-tarball
+++ b/script/package-tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: script/package-tarball
 # Script to build a tarball release package from the current HEAD version.
 # The package version comes from `git-describe --tags' so the release tag should
diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
index 7d4276692..f92a7180e 100755
--- a/share/github-backup-utils/ghe-backup-alambic-cluster
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-alambic-cluster
 #/ Take an online, incremental snapshot of all Alambic Storage data
 #/
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 521a91d2d..c2ff85059 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: . ghe-backup-config
 # GitHub Enterprise backup shell configuration.
 #
diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index 7ef6e40e3..454349f59 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-es-audit-log
 #/ Take a backup of audit logs in ElasticSearch.
 #/
diff --git a/share/github-backup-utils/ghe-backup-es-hookshot b/share/github-backup-utils/ghe-backup-es-hookshot
index 7a69a7e52..9ec41f46a 100755
--- a/share/github-backup-utils/ghe-backup-es-hookshot
+++ b/share/github-backup-utils/ghe-backup-es-hookshot
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-es-hookshot
 #/ Take a backup of hookshot logs in ElasticSearch.
 #/
diff --git a/share/github-backup-utils/ghe-backup-es-rsync b/share/github-backup-utils/ghe-backup-es-rsync
index c3d31cca5..50cb3606c 100755
--- a/share/github-backup-utils/ghe-backup-es-rsync
+++ b/share/github-backup-utils/ghe-backup-es-rsync
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-es-rsync
 #/ Take an online, incremental snapshot of Elasticsearch indices.
 #/
diff --git a/share/github-backup-utils/ghe-backup-es-tarball b/share/github-backup-utils/ghe-backup-es-tarball
index ebce38c47..febfdb718 100755
--- a/share/github-backup-utils/ghe-backup-es-tarball
+++ b/share/github-backup-utils/ghe-backup-es-tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-es-tarball
 #/ Take a tarball snapshot of all Elasticsearch data.
 #/
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
index a0807fe5f..9cdd54e43 100755
--- a/share/github-backup-utils/ghe-backup-pages-cluster
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-pages-cluster
 #/ Take an online, incremental snapshot of all Pages data
 #/
diff --git a/share/github-backup-utils/ghe-backup-pages-rsync b/share/github-backup-utils/ghe-backup-pages-rsync
index 9de913183..318562a91 100755
--- a/share/github-backup-utils/ghe-backup-pages-rsync
+++ b/share/github-backup-utils/ghe-backup-pages-rsync
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-pages-rsync
 #/ Take an online, incremental snapshot of all Pages data.
 #/
diff --git a/share/github-backup-utils/ghe-backup-pages-tarball b/share/github-backup-utils/ghe-backup-pages-tarball
index 7e8bda265..9c56620ef 100755
--- a/share/github-backup-utils/ghe-backup-pages-tarball
+++ b/share/github-backup-utils/ghe-backup-pages-tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-pages-tarball
 #/ Take a tarball snapshot of all Pages data.
 #/
diff --git a/share/github-backup-utils/ghe-backup-redis b/share/github-backup-utils/ghe-backup-redis
index dbd1e796f..2ebe3cd3a 100755
--- a/share/github-backup-utils/ghe-backup-redis
+++ b/share/github-backup-utils/ghe-backup-redis
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-redis
 #/ Take a snapshot of all Redis data. This is needed because older versions of
 #/ the remote side ghe-export-redis command use a blocking SAVE instead of a
diff --git a/share/github-backup-utils/ghe-backup-redis-cluster b/share/github-backup-utils/ghe-backup-redis-cluster
index d571adb8d..fb4e7e13f 100755
--- a/share/github-backup-utils/ghe-backup-redis-cluster
+++ b/share/github-backup-utils/ghe-backup-redis-cluster
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-redis-cluster
 #/ Take a snapshot of all Redis data. This is needed because older versions of
 #/ the remote side ghe-export-redis command use a blocking SAVE instead of a
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 54a6931cc..2ccb1dfed 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-repositories-cluster
 #/ Take an online, incremental snapshot of all Git repository data.
 #/
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index be94160bb..9cc31f02f 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-repositories-rsync
 #/ Take an online, incremental snapshot of all Git repository data.
 #/
diff --git a/share/github-backup-utils/ghe-backup-repositories-tarball b/share/github-backup-utils/ghe-backup-repositories-tarball
index 09ee15ac4..87f695608 100755
--- a/share/github-backup-utils/ghe-backup-repositories-tarball
+++ b/share/github-backup-utils/ghe-backup-repositories-tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-repositories-tarball
 #/ Take a tarball snapshot of all Git repository data.
 #/
diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index a6691c740..25e6d7ae7 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-settings
 #/ Restore settings from a snapshot to the given <host>.
 set -e
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 2c39a9827..0800b54d5 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-backup-userdata <dirname>
 #/ Take an online, incremental snapshot of a user data directory. This is used
 #/ for a number of different simple datastores kept under /data/user on the
diff --git a/share/github-backup-utils/ghe-maintenance-mode-disable b/share/github-backup-utils/ghe-maintenance-mode-disable
index 5df69d785..9c04cff2c 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-disable
+++ b/share/github-backup-utils/ghe-maintenance-mode-disable
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-maintenance-mode-disable <host>
 #/ Disable maintenance mode on GitHub appliance at <host>. This opens up access
 #/ to the appliance.
diff --git a/share/github-backup-utils/ghe-maintenance-mode-enable b/share/github-backup-utils/ghe-maintenance-mode-enable
index eee86cd3d..74673e402 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-enable
+++ b/share/github-backup-utils/ghe-maintenance-mode-enable
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-maintenance-mode-enable [-w] <host>
 #/ Enable maintenance mode on GitHub appliance at <host>. This locks down all
 #/ access to the appliance to prevent writes to datastores and waits for all
diff --git a/share/github-backup-utils/ghe-maintenance-mode-status b/share/github-backup-utils/ghe-maintenance-mode-status
index 679ebb894..2922989cc 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-status
+++ b/share/github-backup-utils/ghe-maintenance-mode-status
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-maintenance-mode-status <host>
 #/ Checks the status of maintenance mode on GitHub appliance at <host>.
 set -e
diff --git a/share/github-backup-utils/ghe-prune-snapshots b/share/github-backup-utils/ghe-prune-snapshots
index 78a30e2e4..051fd7d75 100755
--- a/share/github-backup-utils/ghe-prune-snapshots
+++ b/share/github-backup-utils/ghe-prune-snapshots
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-prune-snapshots
 #/ Keep N latest backup snapshots.
 set -e
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
index e224dcfc6..7014d0332 100755
--- a/share/github-backup-utils/ghe-restore-es-audit-log
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-es-audit-log
 #/ Take a backup of audit logs in ElasticSearch.
 #/
diff --git a/share/github-backup-utils/ghe-restore-es-rsync b/share/github-backup-utils/ghe-restore-es-rsync
index d1b769339..f8d93af88 100755
--- a/share/github-backup-utils/ghe-restore-es-rsync
+++ b/share/github-backup-utils/ghe-restore-es-rsync
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-es-rsync <host>
 #/ Restore an rsync snapshot of all Elasticsearch data to a GitHub instance.
 #/
diff --git a/share/github-backup-utils/ghe-restore-es-tarball b/share/github-backup-utils/ghe-restore-es-tarball
index df5e0e91a..e876b6666 100755
--- a/share/github-backup-utils/ghe-restore-es-tarball
+++ b/share/github-backup-utils/ghe-restore-es-tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-es-tarball <host>
 #/ Restore a tarball snapshot of all ES data to a GitHub instance.
 #/
diff --git a/share/github-backup-utils/ghe-restore-pages-rsync b/share/github-backup-utils/ghe-restore-pages-rsync
index ecda7113b..927459f44 100755
--- a/share/github-backup-utils/ghe-restore-pages-rsync
+++ b/share/github-backup-utils/ghe-restore-pages-rsync
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-pages-rsync <host>
 #/ Restore an rsync snapshot of all Pages data to a GitHub instance.
 #/
diff --git a/share/github-backup-utils/ghe-restore-pages-tarball b/share/github-backup-utils/ghe-restore-pages-tarball
index 9a4daf5e1..e7a40c840 100755
--- a/share/github-backup-utils/ghe-restore-pages-tarball
+++ b/share/github-backup-utils/ghe-restore-pages-tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-pages-tarball <host>
 #/ Restore a tarball snapshot of all Pages data to a GitHub instance.
 #/
diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index d0ae56aeb..418f50a23 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-repositories-rsync <host>
 #/ Restore an rsync snapshot of all Git repository data to a GitHub instance.
 #/
diff --git a/share/github-backup-utils/ghe-restore-repositories-tarball b/share/github-backup-utils/ghe-restore-repositories-tarball
index 3b41830a6..1345c9f74 100755
--- a/share/github-backup-utils/ghe-restore-repositories-tarball
+++ b/share/github-backup-utils/ghe-restore-repositories-tarball
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-repositories-tarball <host>
 #/ Restore a tarball snapshot of all Git repository data to a GitHub instance.
 #/
diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index e3cfe46c9..20116ee87 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-settings <host>
 #/ Restore settings from a snapshot to the given <host>.
 set -e
diff --git a/share/github-backup-utils/ghe-restore-snapshot-path b/share/github-backup-utils/ghe-restore-snapshot-path
index a5a0db8db..18f155917 100755
--- a/share/github-backup-utils/ghe-restore-snapshot-path
+++ b/share/github-backup-utils/ghe-restore-snapshot-path
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-snapshot-path [snapshot]
 #/
 #/ Print the path to the given snapshot. Defaults to current if no argument given.
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index 3ee5942fc..7757546e3 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-restore-userdata <dirname> <host>
 #/ Restore a special user data directory via rsync. This is used
 #/ for a number of different simple datastores kept under /data/user on the
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 67f7e0fff..7cc3811ae 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-ssh [<option>...] <host> [<simple-command>...]
 #/        echo 'set -o pipefail; <complex-command>...' | ghe-ssh [<option>...] <host> /bin/bash
 #/ Helper to ssh into a GitHub instance with the right user and port. The first
diff --git a/test/bin/chown b/test/bin/chown
index 890277ce1..b75d52c59 100755
--- a/test/bin/chown
+++ b/test/bin/chown
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Fake chown command for tests. Avoids needing to creating special users for
 # utlities that chown on the remote side.
 true
diff --git a/test/bin/curl b/test/bin/curl
index 64545c39a..795ec3c73 100755
--- a/test/bin/curl
+++ b/test/bin/curl
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: curl ...
 # Fake curl command stub for tests.
 set -e
diff --git a/test/bin/enterprise-configure b/test/bin/enterprise-configure
index 1e553bafe..ce7aa631f 100755
--- a/test/bin/enterprise-configure
+++ b/test/bin/enterprise-configure
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: enterprise-configure
 # Emulates the remote GitHub enterprise-configure command. Tests use this
 # to assert that the command was executed.
diff --git a/test/bin/ghe-config-apply b/test/bin/ghe-config-apply
index 22285d7b0..c14ebb800 100755
--- a/test/bin/ghe-config-apply
+++ b/test/bin/ghe-config-apply
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: ghe-config-apply
 # Emulates the remote GitHub ghe-config-apply command. Tests use this
 # to assert that the command was executed.
diff --git a/test/bin/ghe-es-snapshot b/test/bin/ghe-es-snapshot
index 99a21a530..a7991564b 100755
--- a/test/bin/ghe-es-snapshot
+++ b/test/bin/ghe-es-snapshot
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: ghe-es-snapshot
 # Emulates the remote GitHub ghe-service-ensure-mysql command. Tests use this
 # to assert that the command was executed.
diff --git a/test/bin/ghe-fake-export-command b/test/bin/ghe-fake-export-command
index 17c53a392..c6a0c0a21 100755
--- a/test/bin/ghe-fake-export-command
+++ b/test/bin/ghe-fake-export-command
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Emulates a remote GitHub export command. Each of the ghe-export-* utilities
 # that are run on the remote side have corresponding commands in this directory
 # that symlink to this file. The command outputs a simple bit of text including
diff --git a/test/bin/ghe-fake-import-command b/test/bin/ghe-fake-import-command
index 610e48abb..2d3264575 100755
--- a/test/bin/ghe-fake-import-command
+++ b/test/bin/ghe-fake-import-command
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Emulates a remote GitHub import command. Each of the ghe-import-* utilities
 # that are run on the remote side have corresponding commands in this directory
 # that symlink to this file. The command just gobbles up stdin and writes a
diff --git a/test/bin/ghe-maintenance b/test/bin/ghe-maintenance
index 4dfcefa44..b8d83bee5 100755
--- a/test/bin/ghe-maintenance
+++ b/test/bin/ghe-maintenance
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Emulates a remote GitHub ghe-maintenance command. Tests use this to assert
 # that a command was executed.
 true
diff --git a/test/bin/ghe-service-ensure-elasticsearch b/test/bin/ghe-service-ensure-elasticsearch
index ad9350788..c844e79b4 100755
--- a/test/bin/ghe-service-ensure-elasticsearch
+++ b/test/bin/ghe-service-ensure-elasticsearch
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: ghe-service-ensure-mysql
 # Emulates the remote GitHub ghe-service-ensure-mysql command. Tests use this
 # to assert that the command was executed.
diff --git a/test/bin/ghe-service-ensure-mysql b/test/bin/ghe-service-ensure-mysql
index 4cef34dc6..a9fa342d0 100755
--- a/test/bin/ghe-service-ensure-mysql
+++ b/test/bin/ghe-service-ensure-mysql
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: ghe-service-ensure-mysql
 # Emulates the remote GitHub ghe-service-ensure-mysql command. Tests use this
 # to assert that the command was executed.
diff --git a/test/bin/ionice-stub b/test/bin/ionice-stub
index e1ec43617..c9a4e6446 100755
--- a/test/bin/ionice-stub
+++ b/test/bin/ionice-stub
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Fake ionice command for environments that don't support it.
 exec "$@"
diff --git a/test/bin/python b/test/bin/python
index 021f9dbb5..c79b0a433 100755
--- a/test/bin/python
+++ b/test/bin/python
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: python -c '...'
 # Fake python command stub for tests. Python is used on the remote side
 # only to parse JSON data retreived from the maintenance status API and produce
diff --git a/test/bin/redis-cli b/test/bin/redis-cli
index f2b114ab0..aae867cda 100755
--- a/test/bin/redis-cli
+++ b/test/bin/redis-cli
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: redis-cli ...
 # Fake redis-cli command stub for tests. The redis-cli utlity is run on the
 # remote side by libexec/ghe-backup-redis to force a background save of redis
diff --git a/test/bin/ssh b/test/bin/ssh
index 56cf6ca57..7b8321ace 100755
--- a/test/bin/ssh
+++ b/test/bin/ssh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: ssh [-o opt=val]... <host> <command>...
 # Fake ssh command that executes <command> locally. This is placed on PATH
 # during tests to fake out a remote host. Both normal ssh invocations and rsync
diff --git a/test/test-bashisms.sh b/test/test-bashisms.sh
index a419ed797..1daf6cece 100755
--- a/test/test-bashisms.sh
+++ b/test/test-bashisms.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # bashisms tests
 
 # Bring in testlib
diff --git a/test/test-ghe-backup-config.sh b/test/test-ghe-backup-config.sh
index f79052e05..8d3ce8104 100755
--- a/test/test-ghe-backup-config.sh
+++ b/test/test-ghe-backup-config.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-backup-config lib tests
 
 # Bring in testlib
diff --git a/test/test-ghe-backup-repositories-rsync-nw.sh b/test/test-ghe-backup-repositories-rsync-nw.sh
index 6ba04718b..989c411e1 100644
--- a/test/test-ghe-backup-repositories-rsync-nw.sh
+++ b/test/test-ghe-backup-repositories-rsync-nw.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-backup-repositories-rsync-nw command tests
 # uses the net-shard filesystem layout
 
diff --git a/test/test-ghe-backup-repositories-rsync.sh b/test/test-ghe-backup-repositories-rsync.sh
index 9ef3308bf..8199dbbf5 100755
--- a/test/test-ghe-backup-repositories-rsync.sh
+++ b/test/test-ghe-backup-repositories-rsync.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-backup-repositories-rsync command tests
 
 # Bring in testlib
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 1643481ad..c2af5a66b 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-backup command tests
 
 # Bring in testlib
diff --git a/test/test-ghe-host-check.sh b/test/test-ghe-host-check.sh
index 55cf3aa93..856603ad1 100755
--- a/test/test-ghe-host-check.sh
+++ b/test/test-ghe-host-check.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-host-check command tests
 
 # Bring in testlib
diff --git a/test/test-ghe-prune-snapshots.sh b/test/test-ghe-prune-snapshots.sh
index 3612a7707..0194504c9 100755
--- a/test/test-ghe-prune-snapshots.sh
+++ b/test/test-ghe-prune-snapshots.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-prune-snapshots command tests
 
 # Bring in testlib
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 5ca5e5f0f..217880d07 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-restore command tests
 
 # Bring in testlib
diff --git a/test/test-ghe-ssh.sh b/test/test-ghe-ssh.sh
index 500ebd3c3..2bdb274ca 100755
--- a/test/test-ghe-ssh.sh
+++ b/test/test-ghe-ssh.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # ghe-ssh command tests
 
 # Bring in testlib
diff --git a/test/testlib.sh b/test/testlib.sh
index 18ae9c2d4..3fc8e1d75 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: . testlib.sh
 # Simple shell command language test library.
 #

From 4f166690000a45a598e22ec5db38a1e097d20936 Mon Sep 17 00:00:00 2001
From: Ben Gollmer <jatoben@github.com>
Date: Fri, 4 Mar 2016 00:21:41 -0700
Subject: [PATCH 164/288] Set ES port by GHE version

---
 share/github-backup-utils/ghe-backup-es-audit-log | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index 014b66fb9..599dee1bf 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -19,7 +19,13 @@ ghe_remote_version_required "$host"
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/audit-log"
 
-if ! indices=$(ghe-ssh "$host" 'curl -s "localhost:9201/_cat/indices/audit_log*?h=index"'); then
+if [ $GHE_VERSION_MAJOR -ge 2 ] && [ $GHE_VERSION_MINOR -ge 2 ]; then
+  es_port=9201
+else
+  es_port=9200
+fi
+
+if ! indices=$(ghe-ssh "$host" "curl -s \"localhost:$es_port/_cat/indices/audit_log*?h=index"\"); then
   echo "Error: failed to retrieve audit log indices." 1>&2
   exit 1
 fi
@@ -31,6 +37,6 @@ for index in $indices; do
     # Hard link any older indices since they are read only and won't change
     ln $GHE_DATA_DIR/current/audit-log/$index.gz $GHE_SNAPSHOT_DIR/audit-log/$index.gz
   else
-    ghe-ssh "$host" "/usr/local/share/enterprise/ghe-es-dump-json 'http://localhost:9201/$index'" | gzip > $GHE_SNAPSHOT_DIR/audit-log/$index.gz
+    ghe-ssh "$host" "/usr/local/share/enterprise/ghe-es-dump-json \"http://localhost:$es_port/$index\"" | gzip > $GHE_SNAPSHOT_DIR/audit-log/$index.gz
   fi
 done

From fa9cbc865d005733c3363f59f0f6818c5a99af20 Mon Sep 17 00:00:00 2001
From: Ben Gollmer <jatoben@github.com>
Date: Fri, 4 Mar 2016 00:22:06 -0700
Subject: [PATCH 165/288] Skip audit log backup on 11.10.x

---
 bin/ghe-backup | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 564597dfe..fac527864 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -147,9 +147,11 @@ else
     failures="$failures redis"
 fi
 
-echo "Backing up audit log ..."
-ghe-backup-es-audit-log ||
-failures="$failures audit-log"
+if [ $GHE_VERSION_MAJOR -ge 2 ]; then
+  echo "Backing up audit log ..."
+  ghe-backup-es-audit-log ||
+  failures="$failures audit-log"
+fi
 
 echo "Backing up hookshot logs ..."
 ghe-backup-es-hookshot ||

From 30fc6317e828351aea32dfe71601af94d15299f7 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 8 Mar 2016 10:30:02 +1100
Subject: [PATCH 166/288] Create remote repositories dir in test-ghe-restore.sh

---
 test/test-ghe-restore.sh | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 5ca5e5f0f..628145442 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -80,6 +80,9 @@ begin_test "ghe-restore into configured vm"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -141,6 +144,9 @@ begin_test "ghe-restore aborts without user verification"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -172,6 +178,9 @@ begin_test "ghe-restore accepts user verification"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -198,6 +207,9 @@ begin_test "ghe-restore -c into unconfigured vm"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # run ghe-restore and write output to file for asserting against
     if ! ghe-restore -v -f -c > "$TRASHDIR/restore-out" 2>&1; then
         cat "$TRASHDIR/restore-out"
@@ -247,6 +259,9 @@ begin_test "ghe-restore into unconfigured vm"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     if [ "$GHE_VERSION_MAJOR" -le 1 ]; then
         # run ghe-restore and write output to file for asserting against
         # this should fail due to the appliance being in an unconfigured state
@@ -309,6 +324,9 @@ begin_test "ghe-restore with host arg"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
     export GHE_RESTORE_HOST
@@ -352,6 +370,9 @@ begin_test "ghe-restore no host arg or configured restore host"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # unset configured restore host
     unset GHE_RESTORE_HOST
 
@@ -377,6 +398,9 @@ begin_test "ghe-restore with no pages backup"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # remove pages data
     rm -rf "$GHE_DATA_DIR/1/pages"
 
@@ -402,6 +426,9 @@ begin_test "ghe-restore with tarball strategy"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+
     # run it
     echo "tarball" > "$GHE_DATA_DIR/current/strategy"
     output=$(ghe-restore -v -f localhost)

From 5c1f8cb341cfc308ba9c73487bdea7c89ac80ce7 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 9 Mar 2016 14:53:37 +0100
Subject: [PATCH 167/288] Bump version: 2.5.1

---
 debian/changelog                  | 10 ++++++++++
 share/github-backup-utils/version |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fc9bbbefd..a17c977b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+github-backup-utils (2.5.1) UNRELEASED; urgency=medium
+
+  * Fixes for cluster restores #173
+  * Fix Elasticsearch backups for GitHub Enterprise <= 2.2 #175
+  * Removed experimental S3 support #167
+  * Remote logging output fixes #170
+  * Update ghe-host-check to detect extra port 22 error #162
+
+ -- Sergio Rubio <rubiojr@github.com>  Wed, 09 Mar 2016 14:44:05 +0100
+
 github-backup-utils (2.5.0) UNRELEASED; urgency=medium
 
   * Adds GitHub Enterpise 2.5 support
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 437459cd9..73462a5a1 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.5.0
+2.5.1

From 73e9a8ee9b10df5026a7970ecd004c4f6d942582 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Sat, 19 Mar 2016 13:53:12 +1100
Subject: [PATCH 168/288] Use .sync_in_progress lock file during cluster
 restore

---
 .../ghe-restore-repositories-dgit             | 51 +++++++++++++++++++
 .../ghe-restore-repositories-gist             | 51 +++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index b90129c40..7527970d3 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -55,15 +55,65 @@ echo "$config" > "$config_file"
 
 opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
 
+# Remote sync-in-progress file location. When this file exists, Git GC
+# operations are disabled on the GitHub instance.
+sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
+
 cleanup() {
   for pid in $(jobs -p); do
     kill -KILL $pid > /dev/null 2>&1 || true
   done
+  for hostname in $hostnames; do
+    ghe-ssh -F $config_file "$hostname:$port" -- "sudo rm -f '$sync_in_progress_file'"
+  done
   rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 }
 
 trap 'cleanup' INT TERM EXIT
 
+wait_pids=""
+for hostname in $hostnames; do
+  # Touch the sync-in-progress file, disabling GC operations, and wait for all
+  # active GC processes to finish on the remote side.
+  echo "
+      set -e
+      sudo -u git touch '$sync_in_progress_file'
+      sanity=0
+      while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
+          # note: the bracket synta[x] below is to prevent matches against the
+          # grep process itself.
+          if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
+              sleep 1
+              sanity=\$(( sanity + 1 ))
+          else
+              exit 0
+          fi
+      done
+      exit 7
+  " | ssh -q $opts -p $port -F $config_file -l $user $hostname -- /bin/sh
+  wait_pids="$wait_pids $hostname:$!"
+done
+
+# strip leading space
+wait_pids="$(echo -e "${wait_pids}" | sed -e 's/^[[:space:]]*//')"
+
+# wait for jobs one by one, bail on the first one
+for pid in $wait_pids; do
+  # pull out pid:hostname pairs into vars
+  wait_hostname="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $1; }')"
+  wait_pid="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $2; }')"
+  wait $wait_pid || {
+      res=$?
+      if [ $res = 7 ]; then
+          echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds on host: $wait_hostname. Aborting..." 1>&2
+      fi
+      exit $res
+  }
+  unset wait_hostname wait_pid
+done
+
+unset wait_pids
+
 rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 mkfifo ssh_routes_in
 mkfifo ssh_routes_out
@@ -85,6 +135,7 @@ for network_path in $network_paths; do
 
   for route in $routes; do
     ghe-rsync -aHR --delete \
+      --exclude ".sync_in_progress" \
       -e "ssh -q $opts -p $port -F $config_file -l $user" \
       --rsync-path="sudo -u git rsync" \
       "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/./$network_path" \
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index a4337bcce..fa9aa9222 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -57,15 +57,65 @@ echo "$config" > "$config_file"
 
 opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
 
+# Remote sync-in-progress file location. When this file exists, Git GC
+# operations are disabled on the GitHub instance.
+sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
+
 cleanup() {
   for pid in $(jobs -p); do
     kill -KILL $pid > /dev/null 2>&1 || true
   done
+  for hostname in $hostnames; do
+    ghe-ssh -F $config_file "$hostname:$port" -- "sudo rm -f '$sync_in_progress_file'"
+  done
   rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 }
 
 trap 'cleanup' INT TERM EXIT
 
+wait_pids=""
+for hostname in $hostnames; do
+  # Touch the sync-in-progress file, disabling GC operations, and wait for all
+  # active GC processes to finish on the remote side.
+  echo "
+      set -e
+      sudo -u git touch '$sync_in_progress_file'
+      sanity=0
+      while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
+          # note: the bracket synta[x] below is to prevent matches against the
+          # grep process itself.
+          if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
+              sleep 1
+              sanity=\$(( sanity + 1 ))
+          else
+              exit 0
+          fi
+      done
+      exit 7
+  " | ssh -q $opts -p $port -F $config_file -l $user $hostname -- /bin/sh
+  wait_pids="$wait_pids $hostname:$!"
+done
+
+# strip leading space
+wait_pids="$(echo -e "${wait_pids}" | sed -e 's/^[[:space:]]*//')"
+
+# wait for jobs one by one, bail on the first one
+for pid in $wait_pids; do
+  # pull out pid:hostname pairs into vars
+  wait_hostname="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $1; }')"
+  wait_pid="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $2; }')"
+  wait $wait_pid || {
+      res=$?
+      if [ $res = 7 ]; then
+          echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds on host: $wait_hostname. Aborting..." 1>&2
+      fi
+      exit $res
+  }
+  unset wait_hostname wait_pid
+done
+
+unset wait_pids
+
 rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 mkfifo ssh_routes_in
 mkfifo ssh_routes_out
@@ -87,6 +137,7 @@ for gist_path in $gist_paths; do
 
   for route in $routes; do
     ghe-rsync -aHR --delete \
+      --exclude ".sync_in_progress" \
       -e "ssh -q $opts -p $port -F $config_file -l $user" \
       --rsync-path="sudo -u git rsync" \
       "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/./$gist_path" \

From 2b401f60cb2f44282488481524ffced5c442b35c Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Sat, 19 Mar 2016 15:35:56 +1100
Subject: [PATCH 169/288] Disable strict host checking in cluster repository
 restores

---
 share/github-backup-utils/ghe-restore-repositories-dgit | 4 +++-
 share/github-backup-utils/ghe-restore-repositories-gist | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index 7527970d3..801a0e465 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -47,7 +47,9 @@ for hostname in $hostnames; do
   config="$config
 Host $hostname
   ServerAliveInterval 60
-  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no
+"
 done
 
 config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index fa9aa9222..23a4f5d5e 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -49,7 +49,9 @@ for hostname in $hostnames; do
   config="$config
 Host $hostname
   ServerAliveInterval 60
-  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no
+"
 done
 
 config_file=$(mktemp -t cluster-backup-restore-XXXXXX)

From 37f816ff44bcd5bb6ecff49fa9c8aa35d8523631 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Sat, 19 Mar 2016 16:44:06 +1100
Subject: [PATCH 170/288] Minimum version enforcement for cluster restores

---
 bin/ghe-restore | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 52b650138..4c8418299 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -106,6 +106,17 @@ if ghe-ssh "$GHE_HOSTNAME" -- \
   restore_settings=false
 fi
 
+# Figure out if we're restoring into a cluster with an unsupported snapshot
+if $cluster; then
+  snapshot_instance_version=$(cat $GHE_RESTORE_SNAPSHOT_PATH/version)
+  if ! echo $snapshot_instance_version | \
+    grep -Eq "v2\.[5-9]|v2\.[1-9][0-9]|v[3-9]|v[1-9][0-9]"; then
+    echo "Error: Snapshot must be from GitHub Enterprise v2.5.0 and above to be restored"
+    echo "       into a cluster (detected $snapshot_instance_version).  Aborting." >&2
+    exit 1
+  fi
+fi
+
 # Figure out if this instance is in a replication pair
 if ghe-ssh "$GHE_HOSTNAME" -- "ghe-repl-status -r 2>/dev/null" \
   | grep -Eq "replica|primary"; then

From a2884e901bf9920a9258e23c418382a3edcde4f5 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Sat, 19 Mar 2016 17:15:50 +1100
Subject: [PATCH 171/288] Fix wording in error

---
 bin/ghe-restore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 4c8418299..90b830c36 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -111,7 +111,7 @@ if $cluster; then
   snapshot_instance_version=$(cat $GHE_RESTORE_SNAPSHOT_PATH/version)
   if ! echo $snapshot_instance_version | \
     grep -Eq "v2\.[5-9]|v2\.[1-9][0-9]|v[3-9]|v[1-9][0-9]"; then
-    echo "Error: Snapshot must be from GitHub Enterprise v2.5.0 and above to be restored"
+    echo "Error: Snapshot must be from GitHub Enterprise v2.5.0 or above to be restored"
     echo "       into a cluster (detected $snapshot_instance_version).  Aborting." >&2
     exit 1
   fi

From 3ac23277f0507006e31ae8af438bc6b818524452 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 00:19:20 -0700
Subject: [PATCH 172/288] Add clustering tests

---
 script/cibuild                   | 12 +++-
 test/cluster/test-ghe-restore.sh | 95 ++++++++++++++++++++++++++++++++
 test/testlib.sh                  | 10 ++++
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100755 test/cluster/test-ghe-restore.sh

diff --git a/script/cibuild b/script/cibuild
index 553a8d035..8dff1dcbd 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -21,7 +21,7 @@ for version in $REMOTE_VERSIONS
 do
     echo "==> Running testsuite with GHE_TEST_REMOTE_VERSION=$version"
     export GHE_TEST_REMOTE_VERSION="$version"
-    if ! ls -1 test/test-*.sh | xargs -P 4 -n 1 /bin/sh; then
+    if ! ls -1 test/test-*.sh | xargs -P 4 -n 1 /bin/bash; then
         res=false
     fi
     echo
@@ -30,6 +30,16 @@ done
 # If any of the version tests failed, exit non-zero
 $res
 
+version="2.5.0"
+echo "==> Running cluster testsuite with GHE_TEST_REMOTE_VERSION=$version"
+export GHE_TEST_REMOTE_VERSION="$version"
+if ! ls -1 test/cluster/test-*.sh | xargs -P 4 -n 1 /bin/bash; then
+    res=false
+fi
+echo
+
+$res
+
 # Bail out when --no-package given
 [ "$1" = "--no-package" ] && exit 0
 
diff --git a/test/cluster/test-ghe-restore.sh b/test/cluster/test-ghe-restore.sh
new file mode 100755
index 000000000..4cfcd15c3
--- /dev/null
+++ b/test/cluster/test-ghe-restore.sh
@@ -0,0 +1,95 @@
+#!/bin/sh
+# ghe-restore command tests in a cluster
+
+# Bring in testlib
+. $(dirname "$0")/testlib.sh
+
+# Add some fake pages data to the snapshot
+mkdir -p "$GHE_DATA_DIR/1/pages"
+cd "$GHE_DATA_DIR/1/pages"
+mkdir -p alice bob
+touch alice/index.html bob/index.html
+
+# Add some fake elasticsearch data to the snapshot
+mkdir -p "$GHE_DATA_DIR/1/elasticsearch"
+cd "$GHE_DATA_DIR/1/elasticsearch"
+echo "fake ES yml file" > elasticsearch.yml
+mkdir -p gh-enterprise-es/node/0
+touch gh-enterprise-es/node/0/stuff1
+touch gh-enterprise-es/node/0/stuff2
+
+# Create some fake hookshot data in the remote data directory
+if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    mkdir -p "$GHE_DATA_DIR/1/hookshot"
+    cd "$GHE_DATA_DIR/1/hookshot"
+    mkdir -p repository-123 repository-456
+    touch repository-123/test.bpack repository-456/test.bpack
+fi
+
+# Create some fake alambic data in the remote data directory
+if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    mkdir -p "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000"
+    touch "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000/test.png"
+
+    mkdir -p "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-releases/0001"
+    touch "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-releases/0001/1ed78298-522b-11e3-9dc0-22eed1f8132d"
+fi
+
+# Add some fake repositories to the snapshot
+mkdir -p "$GHE_DATA_DIR/1/repositories"
+cd "$GHE_DATA_DIR/1/repositories"
+mkdir alice bob
+mkdir alice/repo1.git alice/repo2.git bob/repo3.git
+
+# Initialize test repositories with a fake commit
+for repo in */*.git; do
+    git init -q --bare "$repo"
+    git --git-dir="$repo" --work-tree=. commit -q --allow-empty -m 'test commit'
+done
+
+# Make the current symlink
+ln -s 1 "$GHE_DATA_DIR/current"
+
+# create a fake backups for each datastore
+echo "fake ghe-export-pages data" > "$GHE_DATA_DIR/current/pages.tar"
+echo "fake ghe-export-mysql data" | gzip > "$GHE_DATA_DIR/current/mysql.sql.gz"
+echo "fake ghe-export-redis data" > "$GHE_DATA_DIR/current/redis.rdb"
+echo "fake ghe-export-authorized-keys data" > "$GHE_DATA_DIR/current/authorized-keys.json"
+echo "fake ghe-export-es-indices data" > "$GHE_DATA_DIR/current/elasticsearch.tar"
+echo "fake ghe-export-ssh-host-keys data" > "$GHE_DATA_DIR/current/ssh-host-keys.tar"
+echo "fake ghe-export-repositories data" > "$GHE_DATA_DIR/current/repositories.tar"
+echo "fake ghe-export-settings data" > "$GHE_DATA_DIR/current/settings.json"
+echo "fake license data" > "$GHE_DATA_DIR/current/enterprise.ghl"
+echo "fake manage password hash data" > "$GHE_DATA_DIR/current/manage-password"
+echo "rsync" > "$GHE_DATA_DIR/current/strategy"
+
+setup_remote_cluster
+
+begin_test "cluster: ghe-restore from 2.4.0 snapshot"
+(
+    set -e
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
+    setup_remote_metadata
+
+    # set restore host environ var
+    GHE_RESTORE_HOST=127.0.0.1
+    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"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
+    # run ghe-restore and write output to file for asserting against
+    if ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
+        cat "$TRASHDIR/restore-out"
+        : ghe-restore should have exited non-zero
+        false
+    fi
+
+    # for debugging
+    cat "$TRASHDIR/restore-out"
+
+    # verify connect to right host
+    grep -q "Error: Snapshot must be from" "$TRASHDIR/restore-out"
+)
+end_test
diff --git a/test/testlib.sh b/test/testlib.sh
index 18ae9c2d4..6ab2e0359 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -103,6 +103,16 @@ setup_remote_license () {
 }
 setup_remote_license
 
+setup_remote_cluster () {
+    if [ "$GHE_VERSION_MAJOR" -lt 2 ] || \
+       ([ "$GHE_VERSION_MAJOR" -eq 2 ] && [ "$GHE_VERSION_MINOR" -le 4 ]); then
+      exit
+    fi
+
+    mkdir -p "$GHE_REMOTE_ROOT_DIR/etc/github"
+    touch "$GHE_REMOTE_ROOT_DIR/etc/github/cluster"
+}
+setup_remote_cluster
 
 # Mark the beginning of a test. A subshell should immediately follow this
 # statement.

From 634323d9825990f9114e6ac9dd9f0e7a8c47bc5a Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 00:25:44 -0700
Subject: [PATCH 173/288] Fix paths to ghe-backup-config and testlib.sh

---
 test/cluster/test-ghe-restore.sh | 3 ++-
 test/test-ghe-restore.sh         | 3 ++-
 test/testlib.sh                  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/cluster/test-ghe-restore.sh b/test/cluster/test-ghe-restore.sh
index 4cfcd15c3..8d2606909 100755
--- a/test/cluster/test-ghe-restore.sh
+++ b/test/cluster/test-ghe-restore.sh
@@ -2,7 +2,8 @@
 # ghe-restore command tests in a cluster
 
 # Bring in testlib
-. $(dirname "$0")/testlib.sh
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $ROOTDIR/test/testlib.sh
 
 # Add some fake pages data to the snapshot
 mkdir -p "$GHE_DATA_DIR/1/pages"
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 5ca5e5f0f..8cf850c10 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -2,7 +2,8 @@
 # ghe-restore command tests
 
 # Bring in testlib
-. $(dirname "$0")/testlib.sh
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+. $ROOTDIR/test/testlib.sh
 
 # Add some fake pages data to the snapshot
 mkdir -p "$GHE_DATA_DIR/1/pages"
diff --git a/test/testlib.sh b/test/testlib.sh
index 6ab2e0359..65144d32a 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -22,7 +22,7 @@
 set -e
 
 # Setting basic paths
-ROOTDIR="$(cd $(dirname "$0")/.. && pwd)"
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 PATH="$ROOTDIR/test/bin:$ROOTDIR/bin:$ROOTDIR/share/github-backup-utils:$PATH"
 
 # create a temporary work space
@@ -47,7 +47,7 @@ export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the
 # remote version established above or in the environment.
-. ghe-backup-config
+. $ROOTDIR/share/github-backup-utils/ghe-backup-config
 ghe_parse_remote_version "$GHE_TEST_REMOTE_VERSION"
 ghe_remote_version_config "$GHE_TEST_REMOTE_VERSION"
 

From 7153f0d228565ff2e45a18a4a7dee2f58ed17e5a Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 01:10:39 -0700
Subject: [PATCH 174/288] Test on a 2.4.0 snapshot

---
 test/cluster/test-ghe-restore.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/cluster/test-ghe-restore.sh b/test/cluster/test-ghe-restore.sh
index 8d2606909..4028c9ee7 100755
--- a/test/cluster/test-ghe-restore.sh
+++ b/test/cluster/test-ghe-restore.sh
@@ -80,6 +80,8 @@ begin_test "cluster: ghe-restore from 2.4.0 snapshot"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
+    echo "2.4.0" > "$GHE_DATA_DIR/current/version"
+
     # run ghe-restore and write output to file for asserting against
     if ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
         cat "$TRASHDIR/restore-out"

From ea4b92158cfbe8ce87cbbe0878a37e04a67cb121 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 00:19:20 -0700
Subject: [PATCH 175/288] Add clustering tests

---
 script/cibuild           |  3 ++-
 test/test-ghe-restore.sh | 35 ++++++++++++++++++++++++++++++++++-
 test/testlib.sh          | 14 ++++++++++++--
 3 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/script/cibuild b/script/cibuild
index 553a8d035..af9b00e91 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -10,6 +10,7 @@ REMOTE_VERSIONS="
   11.10.344
   2.0.0
   2.2.0
+  2.5.0
 "
 
 # Enable verbose logging of ssh commands
@@ -21,7 +22,7 @@ for version in $REMOTE_VERSIONS
 do
     echo "==> Running testsuite with GHE_TEST_REMOTE_VERSION=$version"
     export GHE_TEST_REMOTE_VERSION="$version"
-    if ! ls -1 test/test-*.sh | xargs -P 4 -n 1 /bin/sh; then
+    if ! ls -1 test/test-*.sh | xargs -P 4 -n 1 /bin/bash; then
         res=false
     fi
     echo
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 5ca5e5f0f..472403d38 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -2,7 +2,8 @@
 # ghe-restore command tests
 
 # Bring in testlib
-. $(dirname "$0")/testlib.sh
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+. $ROOTDIR/test/testlib.sh
 
 # Add some fake pages data to the snapshot
 mkdir -p "$GHE_DATA_DIR/1/pages"
@@ -410,3 +411,35 @@ begin_test "ghe-restore with tarball strategy"
     echo "$output" | grep -q 'fake ghe-export-repositories data'
 )
 end_test
+
+begin_test "cluster: ghe-restore from v2.4.0 snapshot"
+(
+    set -e
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
+    setup_remote_cluster || exit
+    setup_remote_metadata
+
+    # set restore host environ var
+    GHE_RESTORE_HOST=127.0.0.1
+    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"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
+    echo "v2.4.0" > "$GHE_DATA_DIR/current/version"
+
+    # run ghe-restore and write output to file for asserting against
+    if ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
+        cat "$TRASHDIR/restore-out"
+        : ghe-restore should have exited non-zero
+        false
+    fi
+
+    # for debugging
+    cat "$TRASHDIR/restore-out"
+
+    # verify connect to right host
+    grep -q "Error: Snapshot must be from" "$TRASHDIR/restore-out"
+)
+end_test
diff --git a/test/testlib.sh b/test/testlib.sh
index 18ae9c2d4..47b0b8109 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -22,7 +22,7 @@
 set -e
 
 # Setting basic paths
-ROOTDIR="$(cd $(dirname "$0")/.. && pwd)"
+ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 PATH="$ROOTDIR/test/bin:$ROOTDIR/bin:$ROOTDIR/share/github-backup-utils:$PATH"
 
 # create a temporary work space
@@ -47,7 +47,7 @@ export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the
 # remote version established above or in the environment.
-. ghe-backup-config
+. $ROOTDIR/share/github-backup-utils/ghe-backup-config
 ghe_parse_remote_version "$GHE_TEST_REMOTE_VERSION"
 ghe_remote_version_config "$GHE_TEST_REMOTE_VERSION"
 
@@ -103,6 +103,16 @@ setup_remote_license () {
 }
 setup_remote_license
 
+setup_remote_cluster () {
+    if [ "$GHE_VERSION_MAJOR" -lt 2 ] || \
+       ([ "$GHE_VERSION_MAJOR" -eq 2 ] && [ "$GHE_VERSION_MINOR" -le 4 ]); then
+      return 1
+    fi
+
+    mkdir -p "$GHE_REMOTE_ROOT_DIR/etc/github"
+    touch "$GHE_REMOTE_ROOT_DIR/etc/github/cluster"
+}
+setup_remote_cluster
 
 # Mark the beginning of a test. A subshell should immediately follow this
 # statement.

From 403733b30788f977df8b1b8f8458b5129554b404 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 02:50:21 -0700
Subject: [PATCH 176/288] rm test/cluster

---
 script/cibuild                   | 10 ----
 test/cluster/test-ghe-restore.sh | 98 --------------------------------
 2 files changed, 108 deletions(-)
 delete mode 100755 test/cluster/test-ghe-restore.sh

diff --git a/script/cibuild b/script/cibuild
index e339966d1..af9b00e91 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -31,16 +31,6 @@ done
 # If any of the version tests failed, exit non-zero
 $res
 
-version="2.5.0"
-echo "==> Running cluster testsuite with GHE_TEST_REMOTE_VERSION=$version"
-export GHE_TEST_REMOTE_VERSION="$version"
-if ! ls -1 test/cluster/test-*.sh | xargs -P 4 -n 1 /bin/bash; then
-    res=false
-fi
-echo
-
-$res
-
 # Bail out when --no-package given
 [ "$1" = "--no-package" ] && exit 0
 
diff --git a/test/cluster/test-ghe-restore.sh b/test/cluster/test-ghe-restore.sh
deleted file mode 100755
index 4028c9ee7..000000000
--- a/test/cluster/test-ghe-restore.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-# ghe-restore command tests in a cluster
-
-# Bring in testlib
-ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $ROOTDIR/test/testlib.sh
-
-# Add some fake pages data to the snapshot
-mkdir -p "$GHE_DATA_DIR/1/pages"
-cd "$GHE_DATA_DIR/1/pages"
-mkdir -p alice bob
-touch alice/index.html bob/index.html
-
-# Add some fake elasticsearch data to the snapshot
-mkdir -p "$GHE_DATA_DIR/1/elasticsearch"
-cd "$GHE_DATA_DIR/1/elasticsearch"
-echo "fake ES yml file" > elasticsearch.yml
-mkdir -p gh-enterprise-es/node/0
-touch gh-enterprise-es/node/0/stuff1
-touch gh-enterprise-es/node/0/stuff2
-
-# Create some fake hookshot data in the remote data directory
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    mkdir -p "$GHE_DATA_DIR/1/hookshot"
-    cd "$GHE_DATA_DIR/1/hookshot"
-    mkdir -p repository-123 repository-456
-    touch repository-123/test.bpack repository-456/test.bpack
-fi
-
-# Create some fake alambic data in the remote data directory
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
-    mkdir -p "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000"
-    touch "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000/test.png"
-
-    mkdir -p "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-releases/0001"
-    touch "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-releases/0001/1ed78298-522b-11e3-9dc0-22eed1f8132d"
-fi
-
-# Add some fake repositories to the snapshot
-mkdir -p "$GHE_DATA_DIR/1/repositories"
-cd "$GHE_DATA_DIR/1/repositories"
-mkdir alice bob
-mkdir alice/repo1.git alice/repo2.git bob/repo3.git
-
-# Initialize test repositories with a fake commit
-for repo in */*.git; do
-    git init -q --bare "$repo"
-    git --git-dir="$repo" --work-tree=. commit -q --allow-empty -m 'test commit'
-done
-
-# Make the current symlink
-ln -s 1 "$GHE_DATA_DIR/current"
-
-# create a fake backups for each datastore
-echo "fake ghe-export-pages data" > "$GHE_DATA_DIR/current/pages.tar"
-echo "fake ghe-export-mysql data" | gzip > "$GHE_DATA_DIR/current/mysql.sql.gz"
-echo "fake ghe-export-redis data" > "$GHE_DATA_DIR/current/redis.rdb"
-echo "fake ghe-export-authorized-keys data" > "$GHE_DATA_DIR/current/authorized-keys.json"
-echo "fake ghe-export-es-indices data" > "$GHE_DATA_DIR/current/elasticsearch.tar"
-echo "fake ghe-export-ssh-host-keys data" > "$GHE_DATA_DIR/current/ssh-host-keys.tar"
-echo "fake ghe-export-repositories data" > "$GHE_DATA_DIR/current/repositories.tar"
-echo "fake ghe-export-settings data" > "$GHE_DATA_DIR/current/settings.json"
-echo "fake license data" > "$GHE_DATA_DIR/current/enterprise.ghl"
-echo "fake manage password hash data" > "$GHE_DATA_DIR/current/manage-password"
-echo "rsync" > "$GHE_DATA_DIR/current/strategy"
-
-setup_remote_cluster
-
-begin_test "cluster: ghe-restore from 2.4.0 snapshot"
-(
-    set -e
-    rm -rf "$GHE_REMOTE_ROOT_DIR"
-    setup_remote_metadata
-
-    # set restore host environ var
-    GHE_RESTORE_HOST=127.0.0.1
-    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"
-    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
-
-    echo "2.4.0" > "$GHE_DATA_DIR/current/version"
-
-    # run ghe-restore and write output to file for asserting against
-    if ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
-        cat "$TRASHDIR/restore-out"
-        : ghe-restore should have exited non-zero
-        false
-    fi
-
-    # for debugging
-    cat "$TRASHDIR/restore-out"
-
-    # verify connect to right host
-    grep -q "Error: Snapshot must be from" "$TRASHDIR/restore-out"
-)
-end_test

From d78bff2c0230b3c0682605a948587688a62c8ac0 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 03:02:46 -0700
Subject: [PATCH 177/288] Test on a 2.5.0 snapshot

---
 test/test-ghe-restore.sh | 32 +++++++++++++++++++++++++++++---
 test/testlib.sh          |  1 -
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 472403d38..079ec1e37 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -88,7 +88,7 @@ begin_test "ghe-restore into configured vm"
     # run ghe-restore and write output to file for asserting against
     if ! ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
         cat "$TRASHDIR/restore-out"
-        : ghe-restore should have exited non-zero
+        : ghe-restore should have exited successfully
         false
     fi
 
@@ -416,7 +416,7 @@ begin_test "cluster: ghe-restore from v2.4.0 snapshot"
 (
     set -e
     rm -rf "$GHE_REMOTE_ROOT_DIR"
-    setup_remote_cluster || exit
+    setup_remote_cluster || exit 0
     setup_remote_metadata
 
     # set restore host environ var
@@ -439,7 +439,33 @@ begin_test "cluster: ghe-restore from v2.4.0 snapshot"
     # for debugging
     cat "$TRASHDIR/restore-out"
 
-    # verify connect to right host
+    # verify restore error message
     grep -q "Error: Snapshot must be from" "$TRASHDIR/restore-out"
 )
 end_test
+
+begin_test "cluster: ghe-restore from v2.5.0 snapshot"
+(
+    set -e
+    rm -rf "$GHE_REMOTE_ROOT_DIR"
+    setup_remote_cluster || exit 0
+    setup_remote_metadata
+
+    # set restore host environ var
+    GHE_RESTORE_HOST=127.0.0.1
+    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"
+    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
+
+    echo "v2.5.0" > "$GHE_DATA_DIR/current/version"
+
+    # run ghe-restore and write output to file for asserting against
+    if ! ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
+        cat "$TRASHDIR/restore-out"
+        : ghe-restore should have been exited successfully
+        false
+    fi
+)
+end_test
diff --git a/test/testlib.sh b/test/testlib.sh
index 47b0b8109..9cfe42745 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -112,7 +112,6 @@ setup_remote_cluster () {
     mkdir -p "$GHE_REMOTE_ROOT_DIR/etc/github"
     touch "$GHE_REMOTE_ROOT_DIR/etc/github/cluster"
 }
-setup_remote_cluster
 
 # Mark the beginning of a test. A subshell should immediately follow this
 # statement.

From 5e0c82ef665642b863694adcb32183f1de9bba02 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 03:16:00 -0700
Subject: [PATCH 178/288] Add ghe-cluster-config-apply stub

---
 test/bin/ghe-cluster-config-apply | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 test/bin/ghe-cluster-config-apply

diff --git a/test/bin/ghe-cluster-config-apply b/test/bin/ghe-cluster-config-apply
new file mode 100755
index 000000000..0355b94b2
--- /dev/null
+++ b/test/bin/ghe-cluster-config-apply
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Usage: ghe-cluster-config-apply
+# Emulates the remote GitHub ghe-cluster-config-apply command. Tests use this
+# to assert that the command was executed.
+set -e
+echo "ghe-cluster-config-apply OK"

From 47be7e12c5366620528287427e634eef6c5208a0 Mon Sep 17 00:00:00 2001
From: Daniel Hwang <gnawhleinad@github.com>
Date: Sat, 19 Mar 2016 10:39:49 -0700
Subject: [PATCH 179/288] Update with @snh's feedback

---
 test/test-ghe-restore.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 079ec1e37..a1e8fb3ae 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -436,9 +436,6 @@ begin_test "cluster: ghe-restore from v2.4.0 snapshot"
         false
     fi
 
-    # for debugging
-    cat "$TRASHDIR/restore-out"
-
     # verify restore error message
     grep -q "Error: Snapshot must be from" "$TRASHDIR/restore-out"
 )
@@ -464,7 +461,7 @@ begin_test "cluster: ghe-restore from v2.5.0 snapshot"
     # run ghe-restore and write output to file for asserting against
     if ! ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
         cat "$TRASHDIR/restore-out"
-        : ghe-restore should have been exited successfully
+        : ghe-restore should have exited successfully
         false
     fi
 )

From 4be993be5856617250df500dcc9903006ece1dfc Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Thu, 24 Mar 2016 12:14:16 +0000
Subject: [PATCH 180/288] Refactor with feedback from @rubiojr

---
 share/github-backup-utils/ghe-backup-config   |  3 ++
 share/github-backup-utils/ghe-gc-disable      | 48 +++++++++++++++++
 share/github-backup-utils/ghe-gc-enable       | 27 ++++++++++
 .../ghe-restore-repositories-dgit             | 51 ++-----------------
 .../ghe-restore-repositories-gist             | 51 ++-----------------
 .../ghe-restore-repositories-rsync            | 38 ++------------
 6 files changed, 93 insertions(+), 125 deletions(-)
 create mode 100755 share/github-backup-utils/ghe-gc-disable
 create mode 100755 share/github-backup-utils/ghe-gc-enable

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 521a91d2d..233373c56 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -135,6 +135,9 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
 # Use of this variable allows the location to be overridden in tests.
 : ${GHE_REMOTE_CLUSTER_CONF_FILE:="$GHE_REMOTE_DATA_DIR/user/common/cluster.conf"}
 
+# The location of the file used to disable GC operations on the remote side.
+: ${SYNC_IN_PROGRESS_FILE:="$GHE_REMOTE_DATA_DIR/user/repositories/.sync_in_progress"}
+
 ###############################################################################
 ### Dynamic remote version config
 
diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
new file mode 100755
index 000000000..e7db129a3
--- /dev/null
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -0,0 +1,48 @@
+#!/bin/sh
+#/ Usage: ghe-gc-disable [<option>...] <host>
+#/ Helper to disable and drain GC operations on a GitHub Enterprise server.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+while true; do
+    case "$1" in
+        -F)
+            opts="$1 $2"
+            shift 2
+            ;;
+        *)
+            host="$1"
+            shift
+            break
+            ;;
+    esac
+done
+
+# Show usage with no host
+[ -z "$host" ] && print_usage
+
+# Touch the sync-in-progress file, disabling GC operations, and wait for all
+# active GC processes to finish on the remote side.
+echo "
+    set -e
+    sudo -u git touch '$SYNC_IN_PROGRESS_FILE'
+    for i in \$(seq $GHE_GIT_COOLDOWN_PERIOD); do
+        # note: the bracket synta[x] below is to prevent matches against the
+        # grep process itself.
+        if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
+            sleep 1
+        else
+            exit 0
+        fi
+    done
+    exit 7
+" | ghe-ssh $opts "$host" -- /bin/bash || {
+    res=$?
+    if [ $res = 7 ]; then
+        echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds. Aborting..." 1>&2
+    fi
+    exit $res
+}
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
new file mode 100755
index 000000000..a56f19ce1
--- /dev/null
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -0,0 +1,27 @@
+#!/bin/sh
+#/ Usage: ghe-gc-enable [<option>...] <host>
+#/ Helper to enable GC operations on a GitHub Enterprise server.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+while true; do
+    case "$1" in
+        -F)
+            opts="$1 $2"
+            shift 2
+            ;;
+        *)
+            host="$1"
+            shift
+            break
+            ;;
+    esac
+done
+
+# Show usage with no host
+[ -z "$host" ] && print_usage
+
+ghe-ssh $opts "$host" -- "sudo rm -f '$SYNC_IN_PROGRESS_FILE'"
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index 801a0e465..cffd673fa 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -42,7 +42,7 @@ host=$(ssh_host_part "$GHE_HOSTNAME")
 user="${host%@*}"
 [ "$user" = "$host" ] && user="admin"
 
-hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+hostnames=$(ghe_cluster_online_nodes "git-server")
 for hostname in $hostnames; do
   config="$config
 Host $hostname
@@ -57,65 +57,24 @@ echo "$config" > "$config_file"
 
 opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
 
-# Remote sync-in-progress file location. When this file exists, Git GC
-# operations are disabled on the GitHub instance.
-sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
-
 cleanup() {
   for pid in $(jobs -p); do
     kill -KILL $pid > /dev/null 2>&1 || true
   done
+  # Enable remote GC operations
   for hostname in $hostnames; do
-    ghe-ssh -F $config_file "$hostname:$port" -- "sudo rm -f '$sync_in_progress_file'"
+    ghe-gc-enable -F $config_file $hostname:$port
   done
   rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 }
 
 trap 'cleanup' INT TERM EXIT
 
-wait_pids=""
+# Disable remote GC operations
 for hostname in $hostnames; do
-  # Touch the sync-in-progress file, disabling GC operations, and wait for all
-  # active GC processes to finish on the remote side.
-  echo "
-      set -e
-      sudo -u git touch '$sync_in_progress_file'
-      sanity=0
-      while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
-          # note: the bracket synta[x] below is to prevent matches against the
-          # grep process itself.
-          if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
-              sleep 1
-              sanity=\$(( sanity + 1 ))
-          else
-              exit 0
-          fi
-      done
-      exit 7
-  " | ssh -q $opts -p $port -F $config_file -l $user $hostname -- /bin/sh
-  wait_pids="$wait_pids $hostname:$!"
-done
-
-# strip leading space
-wait_pids="$(echo -e "${wait_pids}" | sed -e 's/^[[:space:]]*//')"
-
-# wait for jobs one by one, bail on the first one
-for pid in $wait_pids; do
-  # pull out pid:hostname pairs into vars
-  wait_hostname="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $1; }')"
-  wait_pid="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $2; }')"
-  wait $wait_pid || {
-      res=$?
-      if [ $res = 7 ]; then
-          echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds on host: $wait_hostname. Aborting..." 1>&2
-      fi
-      exit $res
-  }
-  unset wait_hostname wait_pid
+  ghe-gc-disable -F $config_file $hostname:$port
 done
 
-unset wait_pids
-
 rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 mkfifo ssh_routes_in
 mkfifo ssh_routes_out
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index 83758e38e..83c464246 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -44,7 +44,7 @@ host=$(ssh_host_part "$GHE_HOSTNAME")
 user="${host%@*}"
 [ "$user" = "$host" ] && user="admin"
 
-hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+hostnames=$(ghe_cluster_online_nodes "git-server")
 for hostname in $hostnames; do
   config="$config
 Host $hostname
@@ -59,65 +59,24 @@ echo "$config" > "$config_file"
 
 opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
 
-# Remote sync-in-progress file location. When this file exists, Git GC
-# operations are disabled on the GitHub instance.
-sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
-
 cleanup() {
   for pid in $(jobs -p); do
     kill -KILL $pid > /dev/null 2>&1 || true
   done
+  # Enable remote GC operations
   for hostname in $hostnames; do
-    ghe-ssh -F $config_file "$hostname:$port" -- "sudo rm -f '$sync_in_progress_file'"
+    ghe-gc-enable -F $config_file $hostname:$port
   done
   rm -rf $config_file ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 }
 
 trap 'cleanup' INT TERM EXIT
 
-wait_pids=""
+# Disable remote GC operations
 for hostname in $hostnames; do
-  # Touch the sync-in-progress file, disabling GC operations, and wait for all
-  # active GC processes to finish on the remote side.
-  echo "
-      set -e
-      sudo -u git touch '$sync_in_progress_file'
-      sanity=0
-      while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
-          # note: the bracket synta[x] below is to prevent matches against the
-          # grep process itself.
-          if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
-              sleep 1
-              sanity=\$(( sanity + 1 ))
-          else
-              exit 0
-          fi
-      done
-      exit 7
-  " | ssh -q $opts -p $port -F $config_file -l $user $hostname -- /bin/sh
-  wait_pids="$wait_pids $hostname:$!"
-done
-
-# strip leading space
-wait_pids="$(echo -e "${wait_pids}" | sed -e 's/^[[:space:]]*//')"
-
-# wait for jobs one by one, bail on the first one
-for pid in $wait_pids; do
-  # pull out pid:hostname pairs into vars
-  wait_hostname="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $1; }')"
-  wait_pid="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $2; }')"
-  wait $wait_pid || {
-      res=$?
-      if [ $res = 7 ]; then
-          echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds on host: $wait_hostname. Aborting..." 1>&2
-      fi
-      exit $res
-  }
-  unset wait_hostname wait_pid
+  ghe-gc-enable -F $config_file $hostname:$port
 done
 
-unset wait_pids
-
 rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out
 mkfifo ssh_routes_in
 mkfifo ssh_routes_out
diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index b99c74756..9c21566ba 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -19,47 +19,19 @@ GHE_HOSTNAME="$1"
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
 
-# Remote sync-in-progress file location. When this file exists, Git GC
-# operations are disabled on the GitHub instance.
-sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
-
 # The snapshot to restore should be set by the ghe-restore command but this lets
 # us run this script directly.
 : ${GHE_RESTORE_SNAPSHOT:=current}
 
-# Removes the remote sync-in-progress file on exit, re-enabling GC operations
-# on the remote instance.
 cleanup() {
-    ghe-ssh "$GHE_HOSTNAME" -- "sudo rm -f '$sync_in_progress_file'"
+  # Enable remote GC operations
+  ghe-gc-enable $GHE_HOSTNAME
 }
-trap 'cleanup' EXIT
-trap 'exit $?' INT # ^C always terminate
 
-# Touch the sync-in-progress file, disabling GC operations, and wait for all
-# active GC processes to finish on the remote side.
-echo "
-    set -e
-    sudo -u git touch '$sync_in_progress_file'
+trap 'cleanup' INT TERM EXIT
 
-    sanity=0
-    while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
-        # note: the bracket synta[x] below is to prevent matches against the
-        # grep process itself.
-        if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
-            sleep 1
-            sanity=\$(( sanity + 1 ))
-        else
-            exit 0
-        fi
-    done
-    exit 7
-" | ghe-ssh "$GHE_HOSTNAME" -- /bin/sh || {
-    res=$?
-    if [ $res = 7 ]; then
-        echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds. Aborting..." 1>&2
-    fi
-    exit $res
-}
+# Disable remote GC operations
+ghe-gc-disable $GHE_HOSTNAME
 
 # Transfer all git repository data from the latest snapshot to the GitHub
 # instance in a single rsync invocation.

From 6f8e629e10438182d624c0a31ca8d59de22fdd9b Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Thu, 24 Mar 2016 12:45:01 +0000
Subject: [PATCH 181/288] Fix tests

---
 share/github-backup-utils/ghe-backup-config | 2 +-
 test/bin/ssh                                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 233373c56..ba983829d 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -136,7 +136,7 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
 : ${GHE_REMOTE_CLUSTER_CONF_FILE:="$GHE_REMOTE_DATA_DIR/user/common/cluster.conf"}
 
 # The location of the file used to disable GC operations on the remote side.
-: ${SYNC_IN_PROGRESS_FILE:="$GHE_REMOTE_DATA_DIR/user/repositories/.sync_in_progress"}
+: ${SYNC_IN_PROGRESS_FILE:="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"}
 
 ###############################################################################
 ### Dynamic remote version config
diff --git a/test/bin/ssh b/test/bin/ssh
index 56cf6ca57..bd52fccf5 100755
--- a/test/bin/ssh
+++ b/test/bin/ssh
@@ -33,9 +33,9 @@ cd "$(dirname "$0")"/..
 # Scrub sudo commands from command arguments.
 sh="$(echo "$@" | sed 's/sudo -u [a-z]* //g' | sed 's/sudo //g')"
 
-# Also scrub sudo commands from stdin if just executing /bin/sh and
+# Also scrub sudo commands from stdin if just executing /bin/sh or /bin/bash and
 # piping commands in on standard input.
-if echo "$*" | grep -q "/bin/sh$"; then
+if echo "$*" | grep -q "/bin/sh$\|/bin/bash$"; then
     sed 's/sudo -u [a-z]* //g' | sed 's/sudo //g' | /bin/sh -c "$sh"
 else
     /bin/sh -c "$sh"

From 6701c7a88ecac9dd0f0349f2b4ac945ecc29ca25 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:15:32 +0100
Subject: [PATCH 182/288] Add GHE_CREATE_DATA_DIR config option

If set to 'no', GHE_DATA_DIR will not be created automatically
and restore/backup will exit 8.

Fixes #178
---
 backup.config-example                       |  4 ++++
 share/github-backup-utils/ghe-backup-config |  9 +++++++-
 test/test-ghe-backup-config.sh              | 23 +++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/backup.config-example b/backup.config-example
index 89dd3ce85..2bce1668b 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -32,3 +32,7 @@ GHE_NUM_SNAPSHOTS=10
 # Any extra options passed to the rsync command. Nothing required by default.
 #
 #GHE_EXTRA_RSYNC_OPTS=""
+#
+# If set to 'no', GHE_DATA_DIR will not be created automatically
+# and restore/backup will exit 8
+# GHE_CREATE_DATA_DIR=${GHE_CREATE_DATA_DIR:-yes}
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index c2ff85059..fdeb0ff50 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -72,12 +72,19 @@ if [ -z "$GHE_HOSTNAME" ]; then
     exit 2
 fi
 
+GHE_CREATE_DATA_DIR=${GHE_CREATE_DATA_DIR:-yes}
+
 # Check that the data directory is set and create it if it doesn't exist.
-if [ ! -d "$GHE_DATA_DIR" ]; then
+if [ ! -d "$GHE_DATA_DIR" ] && [ "$GHE_CREATE_DATA_DIR" = "yes" ]; then
     echo "Creating the backup data directory ..." 1>&3
     mkdir -p "$GHE_DATA_DIR"
 fi
 
+if [ ! -d "$GHE_DATA_DIR" ]; then
+    echo "Error: GHE_DATA_DIR $GHE_DATA_DIR does not exist." >&2
+    exit 8
+fi
+
 # Set some defaults if needed.
 : ${GHE_NUM_SNAPSHOTS:=10}
 
diff --git a/test/test-ghe-backup-config.sh b/test/test-ghe-backup-config.sh
index 8d3ce8104..274c19696 100755
--- a/test/test-ghe-backup-config.sh
+++ b/test/test-ghe-backup-config.sh
@@ -15,6 +15,29 @@ export GHE_DATA_DIR GHE_REMOTE_DATA_DIR
 cd "$ROOTDIR"
 . "share/github-backup-utils/ghe-backup-config"
 
+begin_test "ghe-backup-config GHE_CREATE_DATA_DIR disabled"
+(
+    set -e
+    set -x
+    export GHE_DATA_DIR=$(mktemp -d -u)
+    export GHE_CREATE_DATA_DIR=no
+    set +e
+    error=$(. share/github-backup-utils/ghe-backup-config 2>&1)
+    # should exit 8
+    if [ $? != 8 ]; then
+      exit 1
+    fi
+    set -e
+    echo $error | grep -q "Error: GHE_DATA_DIR .* does not exist"
+
+    export GHE_CREATE_DATA_DIR=yes
+    . share/github-backup-utils/ghe-backup-config 2>&1 \
+      | grep -q "Creating the backup data directory ..."
+
+    rm -rf $GHE_DATA_DIR
+)
+end_test
+
 begin_test "ghe-backup-config ssh_host_part"
 (
     set -e

From e017c6256ce0aa9a72186cf51b2cf52a2b83ea73 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:19:18 +0100
Subject: [PATCH 183/288] Make sure the directory exists

---
 test/test-ghe-backup-config.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test-ghe-backup-config.sh b/test/test-ghe-backup-config.sh
index 274c19696..43a489435 100755
--- a/test/test-ghe-backup-config.sh
+++ b/test/test-ghe-backup-config.sh
@@ -33,6 +33,7 @@ begin_test "ghe-backup-config GHE_CREATE_DATA_DIR disabled"
     export GHE_CREATE_DATA_DIR=yes
     . share/github-backup-utils/ghe-backup-config 2>&1 \
       | grep -q "Creating the backup data directory ..."
+    test -d $GHE_DATA_DIR
 
     rm -rf $GHE_DATA_DIR
 )

From bb1f4e578ba45ceff50522c5bd50baffe8ad3bdd Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:20:52 +0100
Subject: [PATCH 184/288] Remove tracing

---
 test/test-ghe-backup-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-ghe-backup-config.sh b/test/test-ghe-backup-config.sh
index 43a489435..430929f03 100755
--- a/test/test-ghe-backup-config.sh
+++ b/test/test-ghe-backup-config.sh
@@ -18,7 +18,7 @@ cd "$ROOTDIR"
 begin_test "ghe-backup-config GHE_CREATE_DATA_DIR disabled"
 (
     set -e
-    set -x
+
     export GHE_DATA_DIR=$(mktemp -d -u)
     export GHE_CREATE_DATA_DIR=no
     set +e

From 168efad56b2b236abce10432cc0da84e233106b5 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:28:03 +0100
Subject: [PATCH 185/288] Make sure GHE_CREATE_DATA_DIR defaults to yes

---
 test/test-ghe-backup-config.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/test-ghe-backup-config.sh b/test/test-ghe-backup-config.sh
index 430929f03..8d7e20e1b 100755
--- a/test/test-ghe-backup-config.sh
+++ b/test/test-ghe-backup-config.sh
@@ -19,6 +19,12 @@ begin_test "ghe-backup-config GHE_CREATE_DATA_DIR disabled"
 (
     set -e
 
+    export GHE_DATA_DIR=$(mktemp -d -u)
+    . share/github-backup-utils/ghe-backup-config 2>&1 \
+      | grep -q "Creating the backup data directory ..."
+    test -d $GHE_DATA_DIR
+    rm -rf $GHE_DATA_DIR
+
     export GHE_DATA_DIR=$(mktemp -d -u)
     export GHE_CREATE_DATA_DIR=no
     set +e
@@ -30,11 +36,6 @@ begin_test "ghe-backup-config GHE_CREATE_DATA_DIR disabled"
     set -e
     echo $error | grep -q "Error: GHE_DATA_DIR .* does not exist"
 
-    export GHE_CREATE_DATA_DIR=yes
-    . share/github-backup-utils/ghe-backup-config 2>&1 \
-      | grep -q "Creating the backup data directory ..."
-    test -d $GHE_DATA_DIR
-
     rm -rf $GHE_DATA_DIR
 )
 end_test

From 9206a33a9d2b307ad28ba78173cc1a6b07afab03 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:29:25 +0100
Subject: [PATCH 186/288] :lipstick: sample config format

---
 backup.config-example | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backup.config-example b/backup.config-example
index 2bce1668b..9f325565e 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -35,4 +35,5 @@ GHE_NUM_SNAPSHOTS=10
 #
 # If set to 'no', GHE_DATA_DIR will not be created automatically
 # and restore/backup will exit 8
-# GHE_CREATE_DATA_DIR=${GHE_CREATE_DATA_DIR:-yes}
+#
+#GHE_CREATE_DATA_DIR=yes

From 948cb1b628cff3a351325235e3ac0490c54ea539 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:49:38 +0100
Subject: [PATCH 187/288] Add Bash styleguide

---
 CONTRIBUTING.md |   2 +
 STYLEGUIDE.md   | 210 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 STYLEGUIDE.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fec2ed2e3..804509d25 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,3 +8,5 @@ Looking to contribute something to this project? That is great, we always apprec
 4. Add and then commit your changes (`git commit -am "Add a new backup endpoint."`).
 5. Push your feature branch to GitHub.com (`git push -u origin my-feature-branch`).
 6. Open a [Pull Request](https://github.com/github/backup-utils/compare/) and wait for our feedback.
+
+Have a look at the styleguide [styleguide](https://github.com/github/backup-utils/tree/master/STYLEGUIDE.md) to make sure you're code style is consistent with the code in this repository.
diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
new file mode 100644
index 000000000..094fa43cd
--- /dev/null
+++ b/STYLEGUIDE.md
@@ -0,0 +1,210 @@
+## Styleguide
+
+If you've not done much Bash development before you may find these debugging tips useful: http://wiki.bash-hackers.org/scripting/debuggingtips
+
+1. Scripts must start with `#!/usr/bin/env bash`.
+
+1. Scripts must use `set -e`.
+   if the return value of a command can be ignored, suffix it with `|| true`
+
+  ``` bash
+  set -e
+  command_that_might_fail || true
+  command_that_should_not_fail
+  ```
+  
+  Note that ignoring an exit status with `|| true` is genrally not a good practice
+  though. Generally speaking it's better to handle the error.
+
+1. Scripts should not check exit status via `$?` manually. rely on `set -e` instead:
+
+  ``` bash
+  cmd
+  if [ $? -eq 0 ]; then
+    echo worked
+  fi
+  ```
+
+  should be written as:
+
+  ``` bash
+  set -e
+  if cmd; then
+    echo worked
+  fi
+  ```
+
+1. Scripts must include a usage, description and optional examples in this format:
+
+  ```bash
+  #/ Usage: ghe-this-is-my-script [options] <required_arg>
+  #/
+  #/ This is a brief description of the script's purpose.
+  #/
+  #/ OPTIONS:
+  #/   -h | --help                      Show this message.
+  #/   -l | --longopt <required_arg>    An option.
+  #/   -c <required_arg>                Another option.
+  #/
+  #/ EXAMPLES: (optional section but nice to have when not trivial)
+  #/
+  #/    This will do foo and bar:
+  #/      $ ghe-this-is-my-script --longopt foobar -c 2
+  #/
+  ```
+
+  If there are no options or required arguments, that can be ignored.
+
+1. Customer-facing scripts must accept both `-h` and `--help` arguments and print the usage information with an `exit 2` status code.
+
+1. Scripts should not use Bash arrays.
+
+1. Scripts should use `test` or `[` whenever possible:
+
+  ``` bash
+  test -f /etc/passwd
+  test -f /etc/passwd -a -f /etc/group
+  if [ "string" = "string" ]; then
+    true
+  fi
+  ```
+
+1. Scripts may use `[[` for advanced bash features
+
+  ``` bash
+  if [[ "$(hostname)" = *.iad.github.net ]]; then
+    true
+  fi
+  ```
+
+1. Scripts may use bash for loops
+
+  ``` bash
+  for ((n=0; n<10; n++)); do
+  done
+  ```
+
+  or
+
+  ```bash
+  for i in $(seq 0 9); do
+  done
+  ```
+
+1. Scripts should use `$[x+y*z]` for mathematical expressions
+
+  ``` bash
+  local n=1
+  let n++
+  n=$[n+1] # preferred
+  n=$[$n+1]
+  n=$((n+1))
+  n=$(($n+1))
+  ```
+
+1. Scripts should use variables sparingly.
+   Short paths and other constants should be repeated liberally throughout
+   code since they can be search/replaced easily if they ever change.
+
+  ``` bash
+  DATA_DB_PATH=/data/user/db
+  mkdir -p $DATA_DB_PATH
+  rsync $DATA_DB_PATH remote:$DATA_DB_PATH
+  ```
+
+  vs the much more readable:
+
+  ``` bash
+  mkdir -p /data/user/db
+  rsync /data/user/db remote:/data/user/db
+  ```
+
+1. Scripts should use lowercase variables for locals,
+   and uppercase for variables inherited or exported via the environment:
+
+  ``` bash
+  #!/bin/bash
+  #/ Usage: [DEBUG=0] process_repo <nwo>
+  nwo=$1
+  [ -n $DEBUG ] && echo "** processing $nwo" >&2
+
+  export GIT_DIR=/data/repos/$nwo.git
+  git rev-list
+  ```
+
+1. Scripts should use `${var}` for interpolation only when required:
+
+  ``` bash
+  greeting=hello
+  echo $greeting
+  echo ${greeting}world
+  ```
+
+1. Scripts should use functions sparingly, opting for small/simple/sequential
+   scripts instead whenever possible when defining functions, use the following style:
+
+  ``` bash
+  my_function() {
+    local arg1=$1
+    [ -n $arg1 ] || return
+    ...
+  }
+  ```
+
+1. Scripts should use `<<heredocs` when dealing with multi-line strings:
+
+  - `<<eof` and `<< eof` will allow interpolation
+  - `<<"eof"` and `<<'eof'` will disallow interpolation
+  - `<<-eof` and `<<-"eof"` will strip off leading tabs first
+
+  ``` bash
+  cat <<"eof" | ssh $remote -- bash
+    foo=bar
+    echo $foo # interpolated on remote side after ssh
+eof
+  ```
+
+  ``` bash
+  bar=baz
+  cat <<eof | ssh $remote -- bash
+    echo $bar > /etc/foo # interpolated before ssh
+    chmod 0600 /etc/foo
+eof
+  ```
+
+1. Scripts should quote variables that could reasonably have a space now or in
+   the future:
+
+  ``` bash
+  if [ ! -z "$packages" ]; then
+    true
+  fi
+  ```
+
+### tests
+
+All tests should use `set -e` before making any assertions:
+
+```bash
+begin_test "echo works"
+(
+  set -e
+
+  echo passing | grep passing
+)
+end_test
+```
+
+If you want to assert failure, please resist the urge to disable `set -e` and
+instead use negation with `!`:
+
+```bash
+begin_test "netcat is not from bsd"
+(
+  set -e
+  setup
+
+  ! nc -h 2>&1 | grep bsd
+)
+end_test
+```

From f681eb4df52751402f5f0dee5af532d66e21cbea Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:50:59 +0100
Subject: [PATCH 188/288] Fix the english

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 804509d25..ec3a16976 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,4 +9,4 @@ Looking to contribute something to this project? That is great, we always apprec
 5. Push your feature branch to GitHub.com (`git push -u origin my-feature-branch`).
 6. Open a [Pull Request](https://github.com/github/backup-utils/compare/) and wait for our feedback.
 
-Have a look at the styleguide [styleguide](https://github.com/github/backup-utils/tree/master/STYLEGUIDE.md) to make sure you're code style is consistent with the code in this repository.
+Have a look at the styleguide [styleguide](https://github.com/github/backup-utils/tree/master/STYLEGUIDE.md) to make sure your code style is consistent with the code in this repository.

From 0468a607f9472e1b142ae1dfa268624cc3327107 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:52:42 +0100
Subject: [PATCH 189/288] :lipstick: sections

---
 STYLEGUIDE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index 094fa43cd..3804e7894 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -1,4 +1,4 @@
-## Styleguide
+# backup-utils Bash styleguide
 
 If you've not done much Bash development before you may find these debugging tips useful: http://wiki.bash-hackers.org/scripting/debuggingtips
 
@@ -181,7 +181,7 @@ eof
   fi
   ```
 
-### tests
+## Writing tests
 
 All tests should use `set -e` before making any assertions:
 

From 1477f32b7e6165ea75330bb74bbf1f0821fad8d4 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:54:10 +0100
Subject: [PATCH 190/288] No need to mention backup-utils here

---
 STYLEGUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index 3804e7894..09f4bc891 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -1,4 +1,4 @@
-# backup-utils Bash styleguide
+# Bash styleguide
 
 If you've not done much Bash development before you may find these debugging tips useful: http://wiki.bash-hackers.org/scripting/debuggingtips
 

From d74921c36fd65c14fe98162767dd7c4b7d1d810e Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:54:45 +0100
Subject: [PATCH 191/288] Numbered test styles

---
 STYLEGUIDE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index 09f4bc891..d562858e8 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -183,7 +183,7 @@ eof
 
 ## Writing tests
 
-All tests should use `set -e` before making any assertions:
+1. All tests should use `set -e` before making any assertions:
 
 ```bash
 begin_test "echo works"
@@ -195,7 +195,7 @@ begin_test "echo works"
 end_test
 ```
 
-If you want to assert failure, please resist the urge to disable `set -e` and
+1. If you want to assert failure, please resist the urge to disable `set -e` and
 instead use negation with `!`:
 
 ```bash

From d1ec037299c8be01d58c820b12a78cdb35d52f09 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 24 Mar 2016 19:55:40 +0100
Subject: [PATCH 192/288] Fix markdown format

---
 STYLEGUIDE.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index d562858e8..12a5a7e93 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -185,26 +185,26 @@ eof
 
 1. All tests should use `set -e` before making any assertions:
 
-```bash
-begin_test "echo works"
-(
-  set -e
-
-  echo passing | grep passing
-)
-end_test
-```
+  ```bash
+  begin_test "echo works"
+  (
+    set -e
+  
+    echo passing | grep passing
+  )
+  end_test
+  ```
 
 1. If you want to assert failure, please resist the urge to disable `set -e` and
 instead use negation with `!`:
 
-```bash
-begin_test "netcat is not from bsd"
-(
-  set -e
-  setup
-
-  ! nc -h 2>&1 | grep bsd
-)
-end_test
-```
+  ```bash
+  begin_test "netcat is not from bsd"
+  (
+    set -e
+    setup
+  
+    ! nc -h 2>&1 | grep bsd
+  )
+  end_test
+  ```

From 26feaa1f4392b21b825040e0c268ecf1cb0fd5da Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 25 Mar 2016 00:25:19 +0000
Subject: [PATCH 193/288] Various fixes

---
 share/github-backup-utils/ghe-gc-disable                | 7 ++++++-
 share/github-backup-utils/ghe-gc-enable                 | 7 ++++++-
 share/github-backup-utils/ghe-restore-repositories-gist | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
index e7db129a3..94cb92ec9 100755
--- a/share/github-backup-utils/ghe-gc-disable
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -1,6 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-gc-disable [<option>...] <host>
+#/
 #/ Helper to disable and drain GC operations on a GitHub Enterprise server.
+#/
+#/ OPTIONS:
+#/   -F	<configfile>		Alternative SSH per-user configuration file.
+#/
 set -e
 
 # Bring in the backup configuration
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
index a56f19ce1..6fd788b31 100755
--- a/share/github-backup-utils/ghe-gc-enable
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -1,6 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #/ Usage: ghe-gc-enable [<option>...] <host>
+#/
 #/ Helper to enable GC operations on a GitHub Enterprise server.
+#/
+#/ OPTIONS:
+#/   -F <configfile>            Alternative SSH per-user configuration file.
+#/
 set -e
 
 # Bring in the backup configuration
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index 83c464246..c4b821b62 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -74,7 +74,7 @@ trap 'cleanup' INT TERM EXIT
 
 # Disable remote GC operations
 for hostname in $hostnames; do
-  ghe-gc-enable -F $config_file $hostname:$port
+  ghe-gc-disable -F $config_file $hostname:$port
 done
 
 rm -rf ssh_routes_in ssh_routes_out ssh_finalize_in ssh_finalize_out

From 3427dfe7df2867bd54250b37ee7c4ae7e150efef Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 25 Mar 2016 05:47:48 +0000
Subject: [PATCH 194/288] Working directory changes

---
 share/github-backup-utils/ghe-backup-config | 19 +++++++++++++------
 share/github-backup-utils/ghe-gc-disable    |  4 ++--
 share/github-backup-utils/ghe-gc-enable     |  4 ++--
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index ba983829d..ba6226fa1 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -5,15 +5,22 @@
 # This file is sourced by the various utilities under bin and share/github-backup-utils to
 # load in backup configuration and ensure things are configured properly.
 #
-# All commands should start with the following:
+# All commands in share/github-backup-utils/ should start with the following:
 #
-#     cd $(dirname "$0")/../..
-#     . share/github-backup-utils/ghe-backup-config
+#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+#
+# And all commands in bin/ should start with the following:
+#
+#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 #
 
-# Assume the current directory is the root. This should be fine so long as all
-# scripts source us in according to the instructions above.
-GHE_BACKUP_ROOT="$(pwd)"
+# If GHE_BACKUP_ROOT has not been set, assume the current directory is the root.
+# This is required for older scripts that don't source us using the above method.
+if [ -z $GHE_BACKUP_ROOT ]; then
+  GHE_BACKUP_ROOT="$(pwd)"
+fi
 
 # Get the version from the version file.
 BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
index 94cb92ec9..468de2585 100755
--- a/share/github-backup-utils/ghe-gc-disable
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
index 6fd788b31..936114ce7 100755
--- a/share/github-backup-utils/ghe-gc-enable
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in

From ddbf8178e6cfeae345ea545d9f3d143e916367b4 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 29 Mar 2016 08:04:55 +1100
Subject: [PATCH 195/288] Revert "Working directory changes"

This reverts commit 3427dfe7df2867bd54250b37ee7c4ae7e150efef.
---
 share/github-backup-utils/ghe-backup-config | 19 ++++++-------------
 share/github-backup-utils/ghe-gc-disable    |  4 ++--
 share/github-backup-utils/ghe-gc-enable     |  4 ++--
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index ce3db0e89..4fd3f6954 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -5,22 +5,15 @@
 # This file is sourced by the various utilities under bin and share/github-backup-utils to
 # load in backup configuration and ensure things are configured properly.
 #
-# All commands in share/github-backup-utils/ should start with the following:
+# All commands should start with the following:
 #
-#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
-#
-# And all commands in bin/ should start with the following:
-#
-#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+#     cd $(dirname "$0")/../..
+#     . share/github-backup-utils/ghe-backup-config
 #
 
-# If GHE_BACKUP_ROOT has not been set, assume the current directory is the root.
-# This is required for older scripts that don't source us using the above method.
-if [ -z $GHE_BACKUP_ROOT ]; then
-  GHE_BACKUP_ROOT="$(pwd)"
-fi
+# Assume the current directory is the root. This should be fine so long as all
+# scripts source us in according to the instructions above.
+GHE_BACKUP_ROOT="$(pwd)"
 
 # Get the version from the version file.
 BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
index 468de2585..94cb92ec9 100755
--- a/share/github-backup-utils/ghe-gc-disable
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
index 936114ce7..6fd788b31 100755
--- a/share/github-backup-utils/ghe-gc-enable
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in

From 086ff39eb023949eb972e2a46e1cbed60619aa63 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 30 Mar 2016 11:13:14 +1100
Subject: [PATCH 196/288] Change to bash for new test

---
 test/bin/ghe-cluster-config-apply | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/bin/ghe-cluster-config-apply b/test/bin/ghe-cluster-config-apply
index 0355b94b2..15d7e9090 100755
--- a/test/bin/ghe-cluster-config-apply
+++ b/test/bin/ghe-cluster-config-apply
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: ghe-cluster-config-apply
 # Emulates the remote GitHub ghe-cluster-config-apply command. Tests use this
 # to assert that the command was executed.

From 64adbef638007f84b54828d54210a4ec70665a72 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 30 Mar 2016 21:03:53 +1100
Subject: [PATCH 197/288] Update backups to use ghe-gc

---
 .../ghe-backup-repositories-cluster           | 50 ++-----------------
 .../ghe-backup-repositories-rsync             | 34 ++-----------
 2 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 2ccb1dfed..3e30721fb 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -84,68 +84,26 @@ echo "$config" > "$config_file"
 
 opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
 
-# Remote sync-in-progress file location. When this file exists, Git GC
-# operations are disabled on the GitHub instance.
-sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
-
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$backup_dir"
 
 # Removes the remote sync-in-progress file on exit, re-enabling GC operations
 # on the remote instance.
 cleanup() {
+  # Enable remote GC operations
   for hostname in $hostnames; do
-    ghe-ssh -F $config_file "$hostname:$port" -- "sudo rm -f '$sync_in_progress_file'"
+    ghe-gc-enable -F $config_file $hostname:$port
   done
   rm -f $config_file
 }
 trap 'cleanup' EXIT
 trap 'exit $?' INT # ^C always terminate
 
-wait_pids=""
+# Disable remote GC operations
 for hostname in $hostnames; do
-  # Touch the sync-in-progress file, disabling GC operations, and wait for all
-  # active GC processes to finish on the remote side.
-  echo "
-      set -e
-      sudo -u git touch '$sync_in_progress_file'
-
-      sanity=0
-      while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
-          # note: the bracket synta[x] below is to prevent matches against the
-          # grep process itself.
-          if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
-              sleep 1
-              sanity=\$(( sanity + 1 ))
-          else
-              exit 0
-          fi
-      done
-      exit 7
-  " | ssh -q $opts -p $port -F $config_file -l $user $hostname -- /bin/sh
-  wait_pids="$wait_pids $hostname:$!"
-done
-
-# strip leading space
-wait_pids="$(echo -e "${wait_pids}" | sed -e 's/^[[:space:]]*//')"
-
-# wait for jobs one by one, bail on the first one
-for pid in $wait_pids; do
-  # pull out pid:hostname pairs into vars
-  wait_hostname="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $1; }')"
-  wait_pid="$(echo $pid | awk 'BEGIN {FS = ":" }; { print $2; }')"
-  wait $wait_pid || {
-      res=$?
-      if [ $res = 7 ]; then
-          echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds on host: $wait_hostname. Aborting..." 1>&2
-      fi
-      exit $res
-  }
-  unset wait_hostname wait_pid
+  ghe-gc-disable -F $config_file $hostname:$port
 done
 
-unset wait_pids
-
 # If we have a previous increment, avoid transferring existing files via rsync's
 # --link-dest support. This also decreases physical space usage considerably.
 if [ -d "$backup_current" ]; then
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 9cc31f02f..ace8f6d74 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -51,46 +51,20 @@ fi
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$host"
 
-# Remote sync-in-progress file location. When this file exists, Git GC
-# operations are disabled on the GitHub instance.
-sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
-
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$backup_dir"
 
 # Removes the remote sync-in-progress file on exit, re-enabling GC operations
 # on the remote instance.
 cleanup() {
-  ghe-ssh "$host" -- "sudo rm -f '$sync_in_progress_file'"
+  # Enable remote GC operations
+  ghe-gc-enable $host
 }
 trap 'cleanup' EXIT
 trap 'exit $?' INT # ^C always terminate
 
-# Touch the sync-in-progress file, disabling GC operations, and wait for all
-# active GC processes to finish on the remote side.
-echo "
-    set -e
-    sudo -u git touch '$sync_in_progress_file'
-
-    sanity=0
-    while [ \$sanity -lt $GHE_GIT_COOLDOWN_PERIOD ]; do
-        # note: the bracket synta[x] below is to prevent matches against the
-        # grep process itself.
-        if ps axo args | grep -E -e '^git( -.*)? nw-repac[k]( |$)' -e '^git( -.*)? g[c]( |$)' >/dev/null; then
-            sleep 1
-            sanity=\$(( sanity + 1 ))
-        else
-            exit 0
-        fi
-    done
-    exit 7
-" | ghe-ssh "$host" -- /bin/sh || {
-    res=$?
-    if [ $res = 7 ]; then
-        echo "Error: Git GC processes remain after $GHE_GIT_COOLDOWN_PERIOD seconds. Aborting..." 1>&2
-    fi
-    exit $res
-}
+# Disable remote GC operations
+ghe-gc-disable $host
 
 # Transfer repository data from a GitHub instance to the current snapshot
 # directory, using a previous snapshot to avoid transferring files that have

From 9fe398a154c438d3a398b6a505807b3d7e2b5e00 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 30 Mar 2016 21:41:18 +1100
Subject: [PATCH 198/288] Don't change working dir

---
 bin/ghe-backup                                  |  4 ++--
 bin/ghe-host-check                              |  6 +++---
 bin/ghe-restore                                 |  6 +++---
 .../ghe-backup-alambic-cluster                  |  4 ++--
 share/github-backup-utils/ghe-backup-config     | 17 +++++++++--------
 .../github-backup-utils/ghe-backup-es-audit-log |  4 ++--
 .../github-backup-utils/ghe-backup-es-hookshot  |  4 ++--
 share/github-backup-utils/ghe-backup-es-rsync   |  4 ++--
 share/github-backup-utils/ghe-backup-es-tarball |  4 ++--
 .../ghe-backup-pages-cluster                    |  4 ++--
 .../github-backup-utils/ghe-backup-pages-rsync  |  4 ++--
 .../ghe-backup-pages-tarball                    |  4 ++--
 share/github-backup-utils/ghe-backup-redis      |  4 ++--
 .../ghe-backup-redis-cluster                    |  4 ++--
 .../ghe-backup-repositories-cluster             |  4 ++--
 .../ghe-backup-repositories-rsync               |  4 ++--
 .../ghe-backup-repositories-tarball             |  4 ++--
 share/github-backup-utils/ghe-backup-settings   |  4 ++--
 share/github-backup-utils/ghe-backup-userdata   |  4 ++--
 share/github-backup-utils/ghe-gc-disable        |  4 ++--
 share/github-backup-utils/ghe-gc-enable         |  4 ++--
 .../ghe-maintenance-mode-disable                |  4 ++--
 .../ghe-maintenance-mode-enable                 |  4 ++--
 .../ghe-maintenance-mode-status                 |  4 ++--
 share/github-backup-utils/ghe-prune-snapshots   |  4 ++--
 .../ghe-restore-alambic-cluster                 |  4 ++--
 .../ghe-restore-es-audit-log                    |  4 ++--
 share/github-backup-utils/ghe-restore-es-rsync  |  4 ++--
 .../github-backup-utils/ghe-restore-es-tarball  |  4 ++--
 .../ghe-restore-pages-dpages                    |  4 ++--
 .../github-backup-utils/ghe-restore-pages-rsync |  4 ++--
 .../ghe-restore-pages-tarball                   |  4 ++--
 .../ghe-restore-repositories-dgit               |  4 ++--
 .../ghe-restore-repositories-gist               |  4 ++--
 .../ghe-restore-repositories-rsync              |  4 ++--
 .../ghe-restore-repositories-tarball            |  4 ++--
 share/github-backup-utils/ghe-restore-settings  |  4 ++--
 .../ghe-restore-snapshot-path                   |  7 +++----
 share/github-backup-utils/ghe-restore-userdata  |  4 ++--
 share/github-backup-utils/ghe-rsync             |  4 ++--
 share/github-backup-utils/ghe-ssh               |  4 ++--
 41 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 592433ea5..e28456ff7 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -8,8 +8,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Used to record failed backup steps
 failures=
diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index b75a3b59d..16139a98c 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -4,9 +4,9 @@
 #/ provided, the $GHE_HOSTNAME configured in backup.config is assumed.
 set -e
 
-# Bring in the backup configuration.
-cd $(dirname "$0")/..
-. share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Use the host provided on the command line if provided, or fallback on the
 # $GHE_HOSTNAME configured in backup.config when not present.
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 68f90d638..3f3fb0143 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -21,9 +21,9 @@
 #/ <https://enterprise.github.com/help/articles/adding-an-ssh-key-for-shell-access>
 set -e
 
-# Bring in the backup configuration.
-cd $(dirname "$0")/..
-. share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Parse arguments
 restore_settings=false
diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
index f92a7180e..7239bd911 100755
--- a/share/github-backup-utils/ghe-backup-alambic-cluster
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 4fd3f6954..320616137 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -1,19 +1,20 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Usage: . ghe-backup-config
 # GitHub Enterprise backup shell configuration.
 #
 # This file is sourced by the various utilities under bin and share/github-backup-utils to
 # load in backup configuration and ensure things are configured properly.
 #
-# All commands should start with the following:
+# All commands in share/github-backup-utils/ should start with the following:
 #
-#     cd $(dirname "$0")/../..
-#     . share/github-backup-utils/ghe-backup-config
+#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+#
+# And all commands in bin/ should start with the following:
+#
+#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
+#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 #
-
-# Assume the current directory is the root. This should be fine so long as all
-# scripts source us in according to the instructions above.
-GHE_BACKUP_ROOT="$(pwd)"
 
 # Get the version from the version file.
 BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index 27268ca1f..37c1c7ef3 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-hookshot b/share/github-backup-utils/ghe-backup-es-hookshot
index 9ec41f46a..ac97e4b03 100755
--- a/share/github-backup-utils/ghe-backup-es-hookshot
+++ b/share/github-backup-utils/ghe-backup-es-hookshot
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-rsync b/share/github-backup-utils/ghe-backup-es-rsync
index 50cb3606c..f684c6576 100755
--- a/share/github-backup-utils/ghe-backup-es-rsync
+++ b/share/github-backup-utils/ghe-backup-es-rsync
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-tarball b/share/github-backup-utils/ghe-backup-es-tarball
index febfdb718..537c23e32 100755
--- a/share/github-backup-utils/ghe-backup-es-tarball
+++ b/share/github-backup-utils/ghe-backup-es-tarball
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Snapshot all Elasticsearch data or fake it when no /data/elasticsearch
 # directory exists.
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
index 9cdd54e43..f43f498b2 100755
--- a/share/github-backup-utils/ghe-backup-pages-cluster
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-pages-rsync b/share/github-backup-utils/ghe-backup-pages-rsync
index 318562a91..4bf492c34 100755
--- a/share/github-backup-utils/ghe-backup-pages-rsync
+++ b/share/github-backup-utils/ghe-backup-pages-rsync
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/pages"
diff --git a/share/github-backup-utils/ghe-backup-pages-tarball b/share/github-backup-utils/ghe-backup-pages-tarball
index 9c56620ef..0b83c401e 100755
--- a/share/github-backup-utils/ghe-backup-pages-tarball
+++ b/share/github-backup-utils/ghe-backup-pages-tarball
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Snapshot all Pages data or fake it when no /data/pages directory exists.
 echo '
diff --git a/share/github-backup-utils/ghe-backup-redis b/share/github-backup-utils/ghe-backup-redis
index 2ebe3cd3a..b3679a5e5 100755
--- a/share/github-backup-utils/ghe-backup-redis
+++ b/share/github-backup-utils/ghe-backup-redis
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-redis-cluster b/share/github-backup-utils/ghe-backup-redis-cluster
index fb4e7e13f..a106ffb1d 100755
--- a/share/github-backup-utils/ghe-backup-redis-cluster
+++ b/share/github-backup-utils/ghe-backup-redis-cluster
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 2ccb1dfed..51fe34ff7 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -32,8 +32,8 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Split host:port into parts
 port=$(ssh_port_part "$GHE_HOSTNAME")
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 9cc31f02f..0375d8ab7 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -32,8 +32,8 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-tarball b/share/github-backup-utils/ghe-backup-repositories-tarball
index 87f695608..67b9de66a 100755
--- a/share/github-backup-utils/ghe-backup-repositories-tarball
+++ b/share/github-backup-utils/ghe-backup-repositories-tarball
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Snapshot all Git repository data
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-export-repositories' > "$GHE_SNAPSHOT_DIR"/repositories.tar
diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index 25e6d7ae7..664b52a27 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -4,8 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$host"
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 0800b54d5..013dd4857 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -6,8 +6,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Verify rsync is available.
 if ! rsync --version 1>/dev/null 2>&1; then
diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
index 94cb92ec9..468de2585 100755
--- a/share/github-backup-utils/ghe-gc-disable
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
index 6fd788b31..936114ce7 100755
--- a/share/github-backup-utils/ghe-gc-enable
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -9,8 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-maintenance-mode-disable b/share/github-backup-utils/ghe-maintenance-mode-disable
index 9c04cff2c..69c89bc53 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-disable
+++ b/share/github-backup-utils/ghe-maintenance-mode-disable
@@ -5,8 +5,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-maintenance-mode-enable b/share/github-backup-utils/ghe-maintenance-mode-enable
index 74673e402..ec7cdf666 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-enable
+++ b/share/github-backup-utils/ghe-maintenance-mode-enable
@@ -6,8 +6,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Parse args
 wait_procs=true
diff --git a/share/github-backup-utils/ghe-maintenance-mode-status b/share/github-backup-utils/ghe-maintenance-mode-status
index 2922989cc..e349e43f3 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-status
+++ b/share/github-backup-utils/ghe-maintenance-mode-status
@@ -4,8 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Parse args
 while true; do
diff --git a/share/github-backup-utils/ghe-prune-snapshots b/share/github-backup-utils/ghe-prune-snapshots
index 051fd7d75..eebfea307 100755
--- a/share/github-backup-utils/ghe-prune-snapshots
+++ b/share/github-backup-utils/ghe-prune-snapshots
@@ -4,8 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # First prune all incomplete / failed snapshot directories
 prune_dirs="$(ls -1 "$GHE_DATA_DIR"/[0-9]*/incomplete 2>/dev/null || true)"
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index a20f5f6b5..c9ecbe8fc 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
index 7014d0332..7e634ca02 100755
--- a/share/github-backup-utils/ghe-restore-es-audit-log
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 1 ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-rsync b/share/github-backup-utils/ghe-restore-es-rsync
index f8d93af88..5568c39a3 100755
--- a/share/github-backup-utils/ghe-restore-es-rsync
+++ b/share/github-backup-utils/ghe-restore-es-rsync
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-tarball b/share/github-backup-utils/ghe-restore-es-tarball
index e876b6666..13779fe49 100755
--- a/share/github-backup-utils/ghe-restore-es-tarball
+++ b/share/github-backup-utils/ghe-restore-es-tarball
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
index e22fa31de..c9410c700 100755
--- a/share/github-backup-utils/ghe-restore-pages-dpages
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-rsync b/share/github-backup-utils/ghe-restore-pages-rsync
index 927459f44..723562e34 100755
--- a/share/github-backup-utils/ghe-restore-pages-rsync
+++ b/share/github-backup-utils/ghe-restore-pages-rsync
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-tarball b/share/github-backup-utils/ghe-restore-pages-tarball
index e7a40c840..1aba55aad 100755
--- a/share/github-backup-utils/ghe-restore-pages-tarball
+++ b/share/github-backup-utils/ghe-restore-pages-tarball
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index cffd673fa..8a0169332 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index c4b821b62..1552770ea 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index 074b24ec9..bb360d143 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-tarball b/share/github-backup-utils/ghe-restore-repositories-tarball
index 1345c9f74..17c1b473f 100755
--- a/share/github-backup-utils/ghe-restore-repositories-tarball
+++ b/share/github-backup-utils/ghe-restore-repositories-tarball
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index 20116ee87..01cf747d9 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -4,8 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-snapshot-path b/share/github-backup-utils/ghe-restore-snapshot-path
index 18f155917..04cf92c4b 100755
--- a/share/github-backup-utils/ghe-restore-snapshot-path
+++ b/share/github-backup-utils/ghe-restore-snapshot-path
@@ -6,10 +6,9 @@
 
 set -e
 
-# Bring in the backup configuration.
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
-
+# Bring in the backup configuration
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 if [ -n "$1" ]; then
   GHE_RESTORE_SNAPSHOT="$(basename "$1")"
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index 7757546e3..c8fc5c492 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -6,8 +6,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 2 ] && print_usage
diff --git a/share/github-backup-utils/ghe-rsync b/share/github-backup-utils/ghe-rsync
index 7b4151d54..1613cd069 100755
--- a/share/github-backup-utils/ghe-rsync
+++ b/share/github-backup-utils/ghe-rsync
@@ -8,8 +8,8 @@
 set -o pipefail
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 # Filter vanished file warnings from both stdout (rsync versions < 3.x) and
 # stderr (rsync versions >= 3.x). The complex redirections are necessary to
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 7cc3811ae..af1d29d12 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -7,8 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 
 opts="$GHE_EXTRA_SSH_OPTS"
 while true; do

From 67cafcdeeb96c0695de445ce97a1e1e284a45357 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 30 Mar 2016 11:14:13 +0000
Subject: [PATCH 199/288] Path fixes

---
 bin/ghe-host-check                          | 2 +-
 share/github-backup-utils/ghe-backup-config | 2 +-
 test/testlib.sh                             | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 16139a98c..3a975ad16 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -51,7 +51,7 @@ if [ $rc -ne 0 ]; then
             ;;
         1)
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
-                exec "bin/$(basename $0)" "$hostname:122"
+                exec "$GHE_BACKUP_ROOT/bin/$(basename $0)" "$hostname:122"
             else
                 echo "$output" 1>&2
             fi
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 320616137..14301c102 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -17,7 +17,7 @@
 #
 
 # Get the version from the version file.
-BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
+BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/share/github-backup-utils/version)"
 
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
diff --git a/test/testlib.sh b/test/testlib.sh
index 5ccc59996..be9bc2e2c 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -47,7 +47,8 @@ export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the
 # remote version established above or in the environment.
-. $ROOTDIR/share/github-backup-utils/ghe-backup-config
+export GHE_BACKUP_ROOT=$ROOTDIR
+. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
 ghe_parse_remote_version "$GHE_TEST_REMOTE_VERSION"
 ghe_remote_version_config "$GHE_TEST_REMOTE_VERSION"
 

From b874d94d6d548088d228973c7459dcaa57a8f98f Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 30 Mar 2016 11:23:46 +0000
Subject: [PATCH 200/288] Remove bashisms

---
 RELEASING.md          | 16 +++++++---------
 debian/control        |  2 +-
 test/test-bashisms.sh | 12 ------------
 3 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100755 test/test-bashisms.sh

diff --git a/RELEASING.md b/RELEASING.md
index 692c74bfc..9f7aae920 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -1,13 +1,11 @@
 # Making a backup-utils release
 
- 1. Install the debian devscripts package:
-    `sudo apt-get install devscripts`
- 2. Add a new version and release notes to the `debian/changelog` file:
+ 1. Add a new version and release notes to the `debian/changelog` file:
     `dch --newversion 2.6.0 --release-heuristic log`
- 3. Rev the `share/github-backup-utils/version` file.
- 4. Tag the release: `git tag v2.0.2`
- 5. Build that tarball package: `make dist`
- 6. Build the deb package: `make deb`. All the tests should pass.
- 7. Draft a new release at https://github.com/github/backup-utils/releases, including the release notes and attaching the tarball and deb packages.
+ 2. Rev the `share/github-backup-utils/version` file.
+ 3. Tag the release: `git tag v2.0.2`
+ 4. Build that tarball package: `make dist`
+ 5. Build the deb package: `make deb`. All the tests should pass.
+ 6. Draft a new release at https://github.com/github/backup-utils/releases, including the release notes and attaching the tarball and deb packages.
     The dist tarball you should upload has the git revision in the file name, i.e. something like `github-backup-utils-v2.5.0-1-g23c41cc.tar.gz`
- 8. Push the head of the release to the 'stable' branch.
+ 7. Push the head of the release to the 'stable' branch.
diff --git a/debian/control b/debian/control
index 4c9bb61b9..c7a42cc30 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Twan Wolthof <xeago@spotify.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 9), git, devscripts
+Build-Depends: debhelper (>= 9), git
 
 Package: github-backup-utils
 Architecture: any
diff --git a/test/test-bashisms.sh b/test/test-bashisms.sh
deleted file mode 100755
index 1daf6cece..000000000
--- a/test/test-bashisms.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# bashisms tests
-
-# Bring in testlib
-. $(dirname "$0")/testlib.sh
-
-begin_test "ghe-* bashisms"
-(
-    set -e
-    checkbashisms -f "$ROOTDIR/bin/ghe-"*
-)
-end_test

From 1d2a7457cc8f61a22561cbdb3436e7a78c61cacd Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 30 Mar 2016 11:39:50 +0000
Subject: [PATCH 201/288] Re-add devscripts package

---
 RELEASING.md   | 16 +++++++++-------
 debian/control |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index 9f7aae920..692c74bfc 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -1,11 +1,13 @@
 # Making a backup-utils release
 
- 1. Add a new version and release notes to the `debian/changelog` file:
+ 1. Install the debian devscripts package:
+    `sudo apt-get install devscripts`
+ 2. Add a new version and release notes to the `debian/changelog` file:
     `dch --newversion 2.6.0 --release-heuristic log`
- 2. Rev the `share/github-backup-utils/version` file.
- 3. Tag the release: `git tag v2.0.2`
- 4. Build that tarball package: `make dist`
- 5. Build the deb package: `make deb`. All the tests should pass.
- 6. Draft a new release at https://github.com/github/backup-utils/releases, including the release notes and attaching the tarball and deb packages.
+ 3. Rev the `share/github-backup-utils/version` file.
+ 4. Tag the release: `git tag v2.0.2`
+ 5. Build that tarball package: `make dist`
+ 6. Build the deb package: `make deb`. All the tests should pass.
+ 7. Draft a new release at https://github.com/github/backup-utils/releases, including the release notes and attaching the tarball and deb packages.
     The dist tarball you should upload has the git revision in the file name, i.e. something like `github-backup-utils-v2.5.0-1-g23c41cc.tar.gz`
- 7. Push the head of the release to the 'stable' branch.
+ 8. Push the head of the release to the 'stable' branch.
diff --git a/debian/control b/debian/control
index c7a42cc30..4c9bb61b9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Twan Wolthof <xeago@spotify.com>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 9), git
+Build-Depends: debhelper (>= 9), git, devscripts
 
 Package: github-backup-utils
 Architecture: any

From edd44a02b87a31f4eeb61a2e0b2c3a1c4099178c Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 30 Mar 2016 14:40:31 +0200
Subject: [PATCH 202/288] Bump version: 2.5.2

---
 debian/changelog                  | 11 +++++++++++
 share/github-backup-utils/version |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a17c977b7..c0aa466c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+github-backup-utils (2.5.2) UNRELEASED; urgency=medium
+
+  * New configuration variable: GHE_CREATE_DATA_DIR #186
+  * Require that snapshots originated from an instance running GitHub
+    Enterprise 2.5.0 or above when restoring to a cluster #182
+  * Prevent Git GC operations and some other maintenance jobs from running
+    while repositories are being restored #179
+  * Fix Solaris and SmartOS support, using Bash everywhere #177
+
+ -- Sergio Rubio <rubiojr@frameos.org>  Wed, 30 Mar 2016 14:32:15 +0200
+
 github-backup-utils (2.5.1) UNRELEASED; urgency=medium
 
   * Fixes for cluster restores #173
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 73462a5a1..f225a78ad 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.5.1
+2.5.2

From a5915ace9c8522a433c5eb2dc555ec269f1f315a Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 30 Mar 2016 14:42:46 +0200
Subject: [PATCH 203/288] Fix my email

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c0aa466c6..69076592c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ github-backup-utils (2.5.2) UNRELEASED; urgency=medium
     while repositories are being restored #179
   * Fix Solaris and SmartOS support, using Bash everywhere #177
 
- -- Sergio Rubio <rubiojr@frameos.org>  Wed, 30 Mar 2016 14:32:15 +0200
+ -- Sergio Rubio <rubiojr@github.com>  Wed, 30 Mar 2016 14:32:15 +0200
 
 github-backup-utils (2.5.1) UNRELEASED; urgency=medium
 

From ad2a5fbd8f5fb902dd0f84a901aa4c6d6884de38 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Mon, 11 Apr 2016 11:05:31 +0200
Subject: [PATCH 204/288] Add git-hooks to backup-utils

Adds a backup and restore process for git-hooks to 2.6. This way
customers can get up and running from a restore right away without
having to trigger manual checkouts of hooks or having to reconfigure
stuff.
---
 bin/ghe-backup                                |   8 ++
 bin/ghe-restore                               |   4 +
 .../ghe-backup-git-hooks-cluster              | 101 ++++++++++++++++++
 .../ghe-restore-git-hooks-cluster             |  77 +++++++++++++
 .../ghe-restore-repositories-dgit             |   2 +-
 share/github-backup-utils/version             |   2 +-
 test/test-ghe-backup.sh                       |  24 +++++
 test/test-ghe-restore.sh                      |  17 +++
 8 files changed, 233 insertions(+), 2 deletions(-)
 create mode 100755 share/github-backup-utils/ghe-backup-git-hooks-cluster
 create mode 100755 share/github-backup-utils/ghe-restore-git-hooks-cluster

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 592433ea5..ec5d291d3 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -170,6 +170,10 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
         echo "Backing up asset attachments ..."
         ghe-backup-alambic-cluster ||
         failures="$failures alambic_assets"
+
+        echo "Backing up custom Git hooks ..."
+        ghe-backup-git-hooks-cluster ||
+        failures="$failures alambic_assets"
     else
         echo "Backing up asset attachments ..."
         ghe-backup-userdata alambic_assets ||
@@ -182,6 +186,10 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
         echo "Backing up hook deliveries ..."
         ghe-backup-userdata hookshot ||
         failures="$failures hookshot"
+
+        echo "Backing up custom Git hooks ..."
+        ghe-backup-userdata git-hooks ||
+        failures="$failures git-hooks"
     fi
 fi
 
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 68f90d638..c6ef65a6d 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -238,6 +238,7 @@ ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT
 if $cluster; then
   echo "Restoring storage data ..."
   ghe-restore-alambic-cluster "$GHE_HOSTNAME" 1>&3
+  ghe-restore-git-hooks-cluster "$GHE_HOSTNAME" 1>&3
 elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
   echo "Restoring asset attachments ..."
   ghe-restore-userdata alambic_assets "$GHE_HOSTNAME" 1>&3
@@ -247,6 +248,9 @@ elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
 
   echo "Restoring hook deliveries ..."
   ghe-restore-userdata hookshot "$GHE_HOSTNAME" 1>&3
+
+  echo "Restoring custom Git hooks ..."
+  ghe-restore-userdata git-hooks "$GHE_HOSTNAME" 1>&3
 fi
 
 if $cluster; then
diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
new file mode 100755
index 000000000..08001cc91
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-backup-git-hooks-cluster
+#/ Take an online, incremental snapshot of custom Git hooks configuration.
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-backup when the cluster strategy is used.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+backup_dir="$GHE_SNAPSHOT_DIR/git-hooks"
+
+# Location of last good backup for rsync --link-dest
+backup_current="$GHE_DATA_DIR/current/git-hooks"
+
+# Verify rsync is available.
+if ! rsync --version 1>/dev/null 2>&1; then
+    echo "Error: rsync not found." 1>&2
+    exit 1
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Generate SSH config for forwarding
+
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+# git server hostnames
+hostnames=$(ghe_cluster_online_nodes "git-server")
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no
+"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+# Remote sync-in-progress file location. When this file exists, Git GC
+# operations are disabled on the GitHub instance.
+sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
+
+# Make sure root backup dir exists if this is the first run
+mkdir -p "$backup_dir"
+
+# Removes the remote sync-in-progress file on exit, re-enabling GC operations
+# on the remote instance.
+cleanup() {
+  rm -f $config_file
+}
+trap 'cleanup' EXIT
+trap 'exit $?' INT # ^C always terminate
+
+# If we have a previous increment, avoid transferring existing files via rsync's
+# --link-dest support. This also decreases physical space usage considerably.
+if [ -d "$backup_current" ]; then
+    link_dest="--link-dest=../../current/git-hooks"
+fi
+
+# Transfer Git hooks data from a GitHub instance to the current snapshot
+# directory, using a previous snapshot to avoid transferring files that have
+# already been transferred. A set of rsync filter rules are provided on stdin
+# for each invocation.
+rsync_git_hooks_data () {
+    port=$(ssh_port_part "$1")
+    host=$(ssh_host_part "$1")
+
+    shift
+    ghe-rsync -a \
+        -e "ssh -q $opts -p $port -F $config_file -l $user" $link_dest \
+        --rsync-path='sudo -u git rsync' \
+        "$host:$GHE_REMOTE_DATA_USER_DIR/git-hooks/" \
+        "$backup_dir" 1>&3
+}
+
+for hostname in $hostnames; do
+  rsync_git_hooks_data $hostname:122 && break
+done
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
new file mode 100755
index 000000000..957fb9865
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-git-hooks-cluster
+#/ Restore custom Git hooks data from an rsync snapshot
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-restore when the cluster strategy is used.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Generate SSH config for forwarding
+config=""
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+hostnames=$(ghe_cluster_online_nodes "git-server")
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ServerAliveInterval 60
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no
+"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+
+# Removes the remote sync-in-progress file on exit, re-enabling GC operations
+# on the remote instance.
+cleanup() {
+  for pid in $(jobs -p); do
+    kill -KILL $pid > /dev/null 2>&1 || true
+  done
+  rm -f $config_file
+}
+trap 'cleanup' INT TERM EXIT
+
+for hostname in $hostnames; do
+  ghe-rsync -aHR --delete \
+  -e "ssh -q $opts -p $port -F $config_file -l $user" \
+  --rsync-path="sudo -u git rsync" \
+  "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" \
+  "$route:$GHE_REMOTE_DATA_USER_DIR/git-hooks" &
+done
+
+for pid in $(jobs -p); do
+  wait $pid
+  ret_code=$?
+  if [ "$ret_code" != "0" ]; then
+    echo "$pid exited $ret_code"
+    exit $ret_code
+  fi
+done
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index cffd673fa..07d20e0ae 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #/ Usage: ghe-restore-repositories-dgit <host>
-#/ Restore repositories fron an rsync snapshot of all Git repository data to a GitHub cluster.
+#/ Restore repositories from an rsync snapshot of all Git repository data to a GitHub cluster.
 #/
 #/ Note: This script typically isn't called directly. It's invoked by the
 #/ ghe-restore command when restoring into a cluster.
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index f225a78ad..e70b4523a 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.5.2
+2.6.0
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index c2af5a66b..9c5090262 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -23,6 +23,11 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     cd "$GHE_REMOTE_DATA_USER_DIR/hookshot"
     mkdir -p repository-123 repository-456
     touch repository-123/test.bpack repository-456/test.bpack
+
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+    cd "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+    mkdir -p repository-123 repository-456
+    touch repository-123/script.sh repository-456/foo.sh
 fi
 
 # Create some fake alambic data in the remote data directory
@@ -120,6 +125,9 @@ begin_test "ghe-backup first snapshot"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
 
+        # verify all git hooks data was transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks" "$GHE_DATA_DIR/current/git-hooks"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi
@@ -192,6 +200,9 @@ begin_test "ghe-backup subsequent snapshot"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
 
+        # verify all git hooks data was transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks" "$GHE_DATA_DIR/current/git-hooks"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi
@@ -276,3 +287,16 @@ begin_test "ghe-backup empty hookshot directory"
   [ ! "$(grep "[l]ink-dest arg does not exist" $TRASHDIR/out)" ]
 )
 end_test
+
+begin_test "ghe-backup empty git-hooks directory"
+(
+  set -e
+
+  rm -rf $GHE_REMOTE_DATA_USER_DIR/git-hooks/repository-*
+  rm -rf $GHE_DATA_DIR/current/git-hooks/repository-*
+  ghe-backup
+
+  # Check that the "--link-dest arg does not exist" message hasn't occurred.
+  [ ! "$(grep "[l]ink-dest arg does not exist" $TRASHDIR/out)" ]
+)
+end_test
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 632d9f3ef..e3f9ac23b 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -25,6 +25,11 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     cd "$GHE_DATA_DIR/1/hookshot"
     mkdir -p repository-123 repository-456
     touch repository-123/test.bpack repository-456/test.bpack
+
+    mkdir -p "$GHE_DATA_DIR/1/git-hooks"
+    cd "$GHE_DATA_DIR/1/git-hooks"
+    mkdir -p repository-123 repository-456
+    touch repository-123/script.sh repository-456/foo.sh
 fi
 
 # Create some fake alambic data in the remote data directory
@@ -122,6 +127,9 @@ begin_test "ghe-restore into configured vm"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
+        # verify all git hooks data was transferred
+        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi
@@ -240,6 +248,9 @@ begin_test "ghe-restore -c into unconfigured vm"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
+        # verify all git hooks data was transferred
+        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi
@@ -299,6 +310,9 @@ begin_test "ghe-restore into unconfigured vm"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
+        # verify all git hooks data was transferred
+        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
 
@@ -348,6 +362,9 @@ begin_test "ghe-restore with host arg"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
+        # verify all git hooks data was transferred
+        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
     fi

From 77504ea016331d1b10a1ddf29efeab0ae9821046 Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Mon, 11 Apr 2016 11:20:36 +0200
Subject: [PATCH 205/288] Add conditional checks for when to run git-hooks
 backup / restore

---
 .../ghe-backup-git-hooks-cluster              |  1 +
 .../ghe-backup-repositories-cluster           |  2 +-
 .../ghe-restore-git-hooks-cluster             | 32 ++++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
index 08001cc91..d2ca90222 100755
--- a/share/github-backup-utils/ghe-backup-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -97,5 +97,6 @@ rsync_git_hooks_data () {
 }
 
 for hostname in $hostnames; do
+  ghe-ssh -F $config_file "$hostname:122" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/git-hooks' ]" || exit 0
   rsync_git_hooks_data $hostname:122 && break
 done
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 2ccb1dfed..68d13c244 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -95,7 +95,7 @@ mkdir -p "$backup_dir"
 # on the remote instance.
 cleanup() {
   for hostname in $hostnames; do
-    ghe-ssh -F $config_file "$hostname:$port" -- "sudo rm -f '$sync_in_progress_file'"
+    ghe-ssh -F $config_file "$hostname:122" -- "sudo rm -f '$sync_in_progress_file'"
   done
   rm -f $config_file
 }
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index 957fb9865..c2df9a89a 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -59,19 +59,21 @@ cleanup() {
 }
 trap 'cleanup' INT TERM EXIT
 
-for hostname in $hostnames; do
-  ghe-rsync -aHR --delete \
-  -e "ssh -q $opts -p $port -F $config_file -l $user" \
-  --rsync-path="sudo -u git rsync" \
-  "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" \
-  "$route:$GHE_REMOTE_DATA_USER_DIR/git-hooks" &
-done
+if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" ]; then
+  for hostname in $hostnames; do
+    ghe-rsync -aHR --delete \
+    -e "ssh -q $opts -p $port -F $config_file -l $user" \
+    --rsync-path="sudo -u git rsync" \
+    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" \
+    "$route:$GHE_REMOTE_DATA_USER_DIR/git-hooks" &
+  done
 
-for pid in $(jobs -p); do
-  wait $pid
-  ret_code=$?
-  if [ "$ret_code" != "0" ]; then
-    echo "$pid exited $ret_code"
-    exit $ret_code
-  fi
-done
+  for pid in $(jobs -p); do
+    wait $pid
+    ret_code=$?
+    if [ "$ret_code" != "0" ]; then
+      echo "$pid exited $ret_code"
+      exit $ret_code
+    fi
+  done
+fi

From ecae7bb73d17835d888d7e30bd035ab43a21b271 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 12 Apr 2016 11:55:05 +0200
Subject: [PATCH 206/288] ghe-host-check: handle ssh_exchange_identification
 error

This may also happen when trying to connect to a GHE instance using port
22:

```
ssh_exchange_identification: Connection closed by remote host
```

Handling this error improves port 122 autodetection.
---
 bin/ghe-host-check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index b75a3b59d..48e773bfd 100755
--- a/bin/ghe-host-check
+++ b/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
 

From dc3be4f3d249567bd16e684289b4527e83ffe996 Mon Sep 17 00:00:00 2001
From: Mutwin Kraus <mutwin@github.com>
Date: Tue, 12 Apr 2016 11:56:14 +0200
Subject: [PATCH 207/288] Write backup-utils version to ghe host for
 diagnostics

---
 bin/ghe-backup                                |  2 ++
 .../ghe-backup-store-version                  | 24 +++++++++++++++++++
 test/test-ghe-backup.sh                       |  3 +++
 3 files changed, 29 insertions(+)
 create mode 100644 share/github-backup-utils/ghe-backup-store-version

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 592433ea5..fd1e1258c 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -121,6 +121,8 @@ if [ "$GHE_BACKUP_STRATEGY" = "tarball" ]; then
     GHE_MAINTENANCE_MODE_ENABLED=true
 fi
 
+ghe-backup-store-version  || true
+
 echo "Backing up GitHub settings ..."
 ghe-backup-settings ||
 failures="$failures settings"
diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
new file mode 100644
index 000000000..c966c28f2
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -0,0 +1,24 @@
+#!/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
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Grab the host
+host="$GHE_HOSTNAME"
+
+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_DIR/user/common/backup-utils-version"
+fi
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index c2af5a66b..5b7d53e9a 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -123,6 +123,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
 

From 6bee311ec1f91cc8857846db2d17da00c60d1da4 Mon Sep 17 00:00:00 2001
From: Mutwin Kraus <mutwin@github.com>
Date: Tue, 12 Apr 2016 11:57:39 +0200
Subject: [PATCH 208/288] Make ghe-backup-store-version executable

---
 share/github-backup-utils/ghe-backup-store-version | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-store-version

diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
old mode 100644
new mode 100755

From 18109cf79ee1cdffa2d1b6cddda6aff8f1eaed80 Mon Sep 17 00:00:00 2001
From: Mutwin Kraus <mutwin@github.com>
Date: Tue, 12 Apr 2016 12:00:52 +0200
Subject: [PATCH 209/288] Use correct path var

---
 share/github-backup-utils/ghe-backup-store-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
index c966c28f2..8fe094e0b 100755
--- a/share/github-backup-utils/ghe-backup-store-version
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -20,5 +20,5 @@ if [ -d .git ]; then
     version_info="$version_info:$ref"
   fi
   echo "$version_info" |
-  ghe-ssh "$GHE_HOSTNAME" -- "sudo dd of=$GHE_REMOTE_DATA_DIR/user/common/backup-utils-version"
+  ghe-ssh "$GHE_HOSTNAME" -- "sudo dd of=$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
 fi

From f4a33e5b8acd63bce6e24e502c1c072ba1d4ef8d Mon Sep 17 00:00:00 2001
From: Mutwin Kraus <mutwin@github.com>
Date: Tue, 12 Apr 2016 12:16:05 +0200
Subject: [PATCH 210/288] Output warning when ghe-backup-store-version fails

---
 bin/ghe-backup | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index fd1e1258c..8c5e94a1d 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -121,7 +121,8 @@ if [ "$GHE_BACKUP_STRATEGY" = "tarball" ]; then
     GHE_MAINTENANCE_MODE_ENABLED=true
 fi
 
-ghe-backup-store-version  || true
+ghe-backup-store-version  ||
+echo "Warning: storing backup-utils version remotely failed."
 
 echo "Backing up GitHub settings ..."
 ghe-backup-settings ||

From 9be6bdb3515e3d4826f9f09ea3b0eb650b4e6dbd Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Wed, 13 Apr 2016 09:49:50 +0200
Subject: [PATCH 211/288] Update based on feedback

---
 .../ghe-backup-git-hooks-cluster                 | 16 +---------------
 .../ghe-restore-git-hooks-cluster                |  4 +---
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
index d2ca90222..33997bbdf 100755
--- a/share/github-backup-utils/ghe-backup-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -36,14 +36,6 @@ ghe_remote_version_required "$host"
 
 config=""
 
-# Split host:port into parts
-port=$(ssh_port_part "$GHE_HOSTNAME")
-host=$(ssh_host_part "$GHE_HOSTNAME")
-
-# Add user / -l option
-user="${host%@*}"
-[ "$user" = "$host" ] && user="admin"
-
 # git server hostnames
 hostnames=$(ghe_cluster_online_nodes "git-server")
 for hostname in $hostnames; do
@@ -59,13 +51,6 @@ echo "$config" > "$config_file"
 
 opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
 
-# Remote sync-in-progress file location. When this file exists, Git GC
-# operations are disabled on the GitHub instance.
-sync_in_progress_file="$GHE_REMOTE_DATA_USER_DIR/repositories/.sync_in_progress"
-
-# Make sure root backup dir exists if this is the first run
-mkdir -p "$backup_dir"
-
 # Removes the remote sync-in-progress file on exit, re-enabling GC operations
 # on the remote instance.
 cleanup() {
@@ -98,5 +83,6 @@ rsync_git_hooks_data () {
 
 for hostname in $hostnames; do
   ghe-ssh -F $config_file "$hostname:122" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/git-hooks' ]" || exit 0
+  # We can stop after the first successful sync since hooks are the same everywhere
   rsync_git_hooks_data $hostname:122 && break
 done
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index c2df9a89a..9ea62f11b 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#/ Usage: ghe-restore-git-hooks-cluster
+#/ Usage: ghe-restore-git-hooks-cluster <host>
 #/ Restore custom Git hooks data from an rsync snapshot
 #/
 #/ Note: This command typically isn't called directly. It's invoked by
@@ -49,8 +49,6 @@ echo "$config" > "$config_file"
 
 opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
 
-# Removes the remote sync-in-progress file on exit, re-enabling GC operations
-# on the remote instance.
 cleanup() {
   for pid in $(jobs -p); do
     kill -KILL $pid > /dev/null 2>&1 || true

From 5ffe60572d38687a3cd55aefe6ee2cc3f284bc81 Mon Sep 17 00:00:00 2001
From: Mutwin Kraus <mutwin@github.com>
Date: Wed, 13 Apr 2016 10:13:54 +0200
Subject: [PATCH 212/288] Remove unused variable and drop version during
 restores too

---
 bin/ghe-restore                                    | 3 +++
 share/github-backup-utils/ghe-backup-store-version | 6 ------
 test/test-ghe-restore.sh                           | 3 +++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 68f90d638..0013ddb0e 100755
--- a/bin/ghe-restore
+++ b/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
diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
index 8fe094e0b..3428ae114 100755
--- a/share/github-backup-utils/ghe-backup-store-version
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -7,12 +7,6 @@ set -e
 cd $(dirname "$0")/../..
 . share/github-backup-utils/ghe-backup-config
 
-# Perform a host-check and establish GHE_REMOTE_XXX variables.
-ghe_remote_version_required "$host"
-
-# Grab the host
-host="$GHE_HOSTNAME"
-
 if [ -d .git ]; then
   version_info="$BACKUP_UTILS_VERSION"
   ref=$(git rev-parse HEAD || true)
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 632d9f3ef..eb70a7533 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -125,6 +125,9 @@ begin_test "ghe-restore into configured vm"
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/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
 

From d66c7d91e414f2fe67b13c040e247d843ffac42f Mon Sep 17 00:00:00 2001
From: Mutwin Kraus <mutwin@github.com>
Date: Wed, 13 Apr 2016 10:19:18 +0200
Subject: [PATCH 213/288] Make sure common dir gets created in restore test

---
 test/test-ghe-restore.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index eb70a7533..49e9e3c71 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -81,8 +81,8 @@ begin_test "ghe-restore into configured vm"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
-    # Create fake remote repositories dir
-    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
+    # Create fake remote repositories and common dirs
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories $GHE_REMOTE_DATA_USER_DIR/common"
 
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1

From 7078b1c3d9b3b25ef0c73ae18be74c85c40853a2 Mon Sep 17 00:00:00 2001
From: Mutwin Kraus <mutwin@github.com>
Date: Wed, 13 Apr 2016 10:27:00 +0200
Subject: [PATCH 214/288] Move backup-utils-version check into 2.5 restore test
 as it won't work with <2.x

---
 test/test-ghe-restore.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 49e9e3c71..bd6f3022c 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -81,8 +81,8 @@ begin_test "ghe-restore into configured vm"
     mkdir -p "$GHE_REMOTE_DATA_DIR/github/current/public/system"
     touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
 
-    # Create fake remote repositories and common dirs
-    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories $GHE_REMOTE_DATA_USER_DIR/common"
+    # Create fake remote repositories dir
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
 
     # set restore host environ var
     GHE_RESTORE_HOST=127.0.0.1
@@ -125,9 +125,6 @@ begin_test "ghe-restore into configured vm"
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/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
 
@@ -483,7 +480,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"
@@ -494,5 +491,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

From b9f993ec65347d31724b23d07b19038b23e2ce58 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 14:23:19 +0200
Subject: [PATCH 215/288] We want rsync to be verbose when using ghe-backup -v

---
 share/github-backup-utils/ghe-backup-alambic-cluster      | 2 +-
 share/github-backup-utils/ghe-backup-pages-cluster        | 2 +-
 share/github-backup-utils/ghe-backup-repositories-cluster | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
index f92a7180e..a965411a0 100755
--- a/share/github-backup-utils/ghe-backup-alambic-cluster
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -77,7 +77,7 @@ for hostname in $hostnames; do
   echo "* Transferring storage files ..." 1>&3
 
   # Transfer all data from the user data directory using rsync.
-  ghe-rsync -az \
+  ghe-rsync -avz \
       -e "ssh -q $opts -p 122 -F $config_file -l $user" \
       --rsync-path='sudo -u git rsync' \
       $link_dest \
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
index 9cdd54e43..e84907548 100755
--- a/share/github-backup-utils/ghe-backup-pages-cluster
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -77,7 +77,7 @@ for hostname in $hostnames; do
   echo "* Transferring pages files ..." 1>&3
 
   # Transfer all data from the user data directory using rsync.
-  ghe-rsync -az \
+  ghe-rsync -avz \
       -e "ssh -q $opts -p 122 -F $config_file -l $user" \
       --rsync-path='sudo -u git rsync' \
       $link_dest \
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 2ccb1dfed..0e36efbcb 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -161,7 +161,7 @@ rsync_repository_data () {
     host=$(ssh_host_part "$1")
 
     shift
-    ghe-rsync -a \
+    ghe-rsync -av \
         -e "ssh -q $opts -p $port -F $config_file -l $user" \
         $link_dest "$@" \
         --rsync-path='sudo -u git rsync' \

From 4e010362c7f62439a6a880ea9799103b425cd283 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 14:24:10 +0200
Subject: [PATCH 216/288] Added ghe-backup-fsck

---
 backup.config-example                     |  8 ++-
 bin/ghe-backup                            |  6 +++
 share/github-backup-utils/ghe-backup-fsck | 62 +++++++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 share/github-backup-utils/ghe-backup-fsck

diff --git a/backup.config-example b/backup.config-example
index 9f325565e..d2fe3828a 100644
--- a/backup.config-example
+++ b/backup.config-example
@@ -32,8 +32,14 @@ GHE_NUM_SNAPSHOTS=10
 # Any extra options passed to the rsync command. Nothing required by default.
 #
 #GHE_EXTRA_RSYNC_OPTS=""
-#
+
 # If set to 'no', GHE_DATA_DIR will not be created automatically
 # and restore/backup will exit 8
 #
 #GHE_CREATE_DATA_DIR=yes
+
+# If set to 'yes', git fsck will run on the repositories
+# and print some additional info.
+#
+# WARNING: do not enable this, only useful for debugging/development
+#GHE_BACKUP_FSCK=no
diff --git a/bin/ghe-backup b/bin/ghe-backup
index 8c5e94a1d..6b3657686 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -202,6 +202,12 @@ if $GHE_MAINTENANCE_MODE_ENABLED; then
     GHE_MAINTENANCE_MODE_ENABLED=false
 fi
 
+# git fsck repositories after the backup
+if [ "$GHE_BACKUP_FSCK" = "yes" ]; then
+  ghe-backup-fsck ||
+    failures="$failures fsck"
+fi
+
 # If everything was successful, mark the snapshot as complete, update the
 # current symlink to point to the new snapshot and prune expired and failed
 # snapshots.
diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
new file mode 100644
index 000000000..d67e65dff
--- /dev/null
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-backup-fsck [--print-nwo]
+#/ git fsck backed up repos
+set -e
+
+repos=0
+errors=0
+warnings=0
+log=$(mktemp)
+
+for repo in $(find $GHE_SNAPSHOT_DIR/repositories/ -type d -name \*.git); do
+  repos=$(($repos+1))
+  before_time=$(date +%s)
+
+  status=$(
+    set -e
+
+    cd $repo
+
+    nwo="-"
+    if [ "$1" = "--print-nwo" ] && [ -f info/nwo ]; then
+      nwo="$(cat info/nwo)"
+    fi
+
+    if [ ! -f objects/info/alternates ] || grep -q '^\.\.' objects/info/alternates; then
+      git fsck --no-dangling >/dev/null 2>$log && {
+        echo "OK $repo $nwo"; exit
+      }
+    else
+      GIT_ALTERNATE_OBJECT_DIRECTORIES=../network.git/objects git fsck --no-dangling >/dev/null 2>$log && {
+        echo "WARN $repo $nwo (alternates absolute path)"; exit
+      }
+    fi
+
+    echo "ERROR $repo $nwo"
+  )
+
+  elapsed_time=$(($(date +%s) - before_time))
+
+  if [[ ! "$status" =~ ^OK ]] || [ $elapsed_time -gt 5 ]; then
+    echo "$status ${elapsed_time}s"
+    [[ ! "$status" =~ ^OK ]] && cat $log
+  fi
+
+  case "$status" in
+    OK*)
+      ;;
+    WARN*)
+      warnings=$(($warnings+1))
+      ;;
+    ERROR*)
+      errors=$(($errors+1))
+      ;;
+   esac
+
+done
+
+echo Total repos: $repos
+echo Errors:      $errors
+echo Warnings:    $warnings
+
+[ $errors -gt 0 ] && exit 1

From 14aac23e01ed6bdc59017654cd6c3126401575d8 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 14:23:19 +0200
Subject: [PATCH 217/288] We want rsync to be verbose when using ghe-backup -v

---
 share/github-backup-utils/ghe-backup-alambic-cluster      | 2 +-
 share/github-backup-utils/ghe-backup-pages-cluster        | 2 +-
 share/github-backup-utils/ghe-backup-repositories-cluster | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
index f92a7180e..a965411a0 100755
--- a/share/github-backup-utils/ghe-backup-alambic-cluster
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -77,7 +77,7 @@ for hostname in $hostnames; do
   echo "* Transferring storage files ..." 1>&3
 
   # Transfer all data from the user data directory using rsync.
-  ghe-rsync -az \
+  ghe-rsync -avz \
       -e "ssh -q $opts -p 122 -F $config_file -l $user" \
       --rsync-path='sudo -u git rsync' \
       $link_dest \
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
index 9cdd54e43..e84907548 100755
--- a/share/github-backup-utils/ghe-backup-pages-cluster
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -77,7 +77,7 @@ for hostname in $hostnames; do
   echo "* Transferring pages files ..." 1>&3
 
   # Transfer all data from the user data directory using rsync.
-  ghe-rsync -az \
+  ghe-rsync -avz \
       -e "ssh -q $opts -p 122 -F $config_file -l $user" \
       --rsync-path='sudo -u git rsync' \
       $link_dest \
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 2ccb1dfed..0e36efbcb 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -161,7 +161,7 @@ rsync_repository_data () {
     host=$(ssh_host_part "$1")
 
     shift
-    ghe-rsync -a \
+    ghe-rsync -av \
         -e "ssh -q $opts -p $port -F $config_file -l $user" \
         $link_dest "$@" \
         --rsync-path='sudo -u git rsync' \

From 400c0e4a6cf00a5fdd1c5bea0dfa246c78271b7e Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 14:55:45 +0200
Subject: [PATCH 218/288] ghe-backup-fsck needs to be executable

---
 share/github-backup-utils/ghe-backup-fsck | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 share/github-backup-utils/ghe-backup-fsck

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
old mode 100644
new mode 100755

From 08104e8f9b2d017509459cab5762c96a35ab922d Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 15:02:45 +0200
Subject: [PATCH 219/288] Source backup utils configuration

---
 share/github-backup-utils/ghe-backup-fsck | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index d67e65dff..d9ebd08f9 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -3,6 +3,10 @@
 #/ git fsck backed up repos
 set -e
 
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
 repos=0
 errors=0
 warnings=0

From 1ed1d0e711e0482302e05f731514a2945480ab6d Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 15:05:40 +0200
Subject: [PATCH 220/288] Make sure git is available

---
 share/github-backup-utils/ghe-backup-fsck | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index d9ebd08f9..85b8fe39c 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -7,6 +7,12 @@ set -e
 cd $(dirname "$0")/../..
 . share/github-backup-utils/ghe-backup-config
 
+# Verify git is available.
+if ! git --version 1>/dev/null 2>&1; then
+    echo "Error: git not found." 1>&2
+    exit 1
+fi
+
 repos=0
 errors=0
 warnings=0

From 8e5324892235f12d5bc8fcc73a69db3b521421c0 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 15:06:40 +0200
Subject: [PATCH 221/288] Log if git fsck has been enabled

---
 bin/ghe-backup | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 6b3657686..236b86a36 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -204,6 +204,7 @@ fi
 
 # git fsck repositories after the backup
 if [ "$GHE_BACKUP_FSCK" = "yes" ]; then
+  echo "Running git fsck on repos..."
   ghe-backup-fsck ||
     failures="$failures fsck"
 fi

From 410223ddec32c2cc49a2f55c3cb2b1c40fa9dd90 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 15:59:05 +0200
Subject: [PATCH 222/288] Do not exit 1 even if there are fsck errors

---
 share/github-backup-utils/ghe-backup-fsck | 2 --
 1 file changed, 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index 85b8fe39c..2fae831f2 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -68,5 +68,3 @@ done
 echo Total repos: $repos
 echo Errors:      $errors
 echo Warnings:    $warnings
-
-[ $errors -gt 0 ] && exit 1

From d32e29e269debddc33cf41a7a4c099ed1bb11574 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 16:16:41 +0200
Subject: [PATCH 223/288] :lipstick:

---
 share/github-backup-utils/ghe-backup-fsck | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index 2fae831f2..79afb9535 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -9,8 +9,8 @@ cd $(dirname "$0")/../..
 
 # Verify git is available.
 if ! git --version 1>/dev/null 2>&1; then
-    echo "Error: git not found." 1>&2
-    exit 1
+  echo "Error: git not found." 1>&2
+  exit 1
 fi
 
 repos=0
@@ -65,6 +65,6 @@ for repo in $(find $GHE_SNAPSHOT_DIR/repositories/ -type d -name \*.git); do
 
 done
 
-echo Total repos: $repos
-echo Errors:      $errors
-echo Warnings:    $warnings
+echo "* Total repos: $repos"
+echo "* Errors:      $errors"
+echo "* Warnings:    $warnings"

From 6c4adb359632e93e0c5cd3f2cb4177b8e30adde8 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 21:34:54 +0200
Subject: [PATCH 224/288] Tweak the fsck output and add some tests

---
 bin/ghe-backup                            |  3 +-
 share/github-backup-utils/ghe-backup-fsck | 36 ++++++++++++++---------
 test/test-ghe-backup.sh                   | 19 +++++++++++-
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 236b86a36..814e9b32a 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -204,8 +204,7 @@ fi
 
 # git fsck repositories after the backup
 if [ "$GHE_BACKUP_FSCK" = "yes" ]; then
-  echo "Running git fsck on repos..."
-  ghe-backup-fsck ||
+  ghe-backup-fsck $GHE_SNAPSHOT_DIR ||
     failures="$failures fsck"
 fi
 
diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index 79afb9535..e9574867e 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -1,24 +1,37 @@
 #!/usr/bin/env bash
-#/ Usage: ghe-backup-fsck [--print-nwo]
-#/ git fsck backed up repos
+#/ Usage: ghe-backup-fsck <snapshot-dir> [--print-nwo]
+#/
+#/ Run git fsck on backed up repositories.
 set -e
 
 # Bring in the backup configuration
 cd $(dirname "$0")/../..
 . share/github-backup-utils/ghe-backup-config
 
+echo "Running git fsck on repos..."
+
 # Verify git is available.
 if ! git --version 1>/dev/null 2>&1; then
   echo "Error: git not found." 1>&2
   exit 1
 fi
 
+sdir=$1
 repos=0
 errors=0
-warnings=0
 log=$(mktemp)
+t_start=$(date +%s)
+
+if [ -z "$sdir" ] || [ ! -d "$sdir" ]; then
+  print_usage
+fi
 
-for repo in $(find $GHE_SNAPSHOT_DIR/repositories/ -type d -name \*.git); do
+if [ ! -d "$sdir/repositories" ]; then
+  echo "Error: $sdir is not a valid snapshot." >&2
+  exit 1
+fi
+
+for repo in $(find $sdir/repositories/ -type d -name \*.git); do
   repos=$(($repos+1))
   before_time=$(date +%s)
 
@@ -28,16 +41,16 @@ for repo in $(find $GHE_SNAPSHOT_DIR/repositories/ -type d -name \*.git); do
     cd $repo
 
     nwo="-"
-    if [ "$1" = "--print-nwo" ] && [ -f info/nwo ]; then
+    if [ "$2" = "--print-nwo" ] && [ -f info/nwo ]; then
       nwo="$(cat info/nwo)"
     fi
 
     if [ ! -f objects/info/alternates ] || grep -q '^\.\.' objects/info/alternates; then
-      git fsck --no-dangling >/dev/null 2>$log && {
+      git fsck --no-dangling >$log 2>&1 && {
         echo "OK $repo $nwo"; exit
       }
     else
-      GIT_ALTERNATE_OBJECT_DIRECTORIES=../network.git/objects git fsck --no-dangling >/dev/null 2>$log && {
+      GIT_ALTERNATE_OBJECT_DIRECTORIES=../network.git/objects git fsck --no-dangling >$log 2>&1 && {
         echo "WARN $repo $nwo (alternates absolute path)"; exit
       }
     fi
@@ -48,16 +61,13 @@ for repo in $(find $GHE_SNAPSHOT_DIR/repositories/ -type d -name \*.git); do
   elapsed_time=$(($(date +%s) - before_time))
 
   if [[ ! "$status" =~ ^OK ]] || [ $elapsed_time -gt 5 ]; then
-    echo "$status ${elapsed_time}s"
+    echo "$status ${elapsed_time}s" 1>&3
     [[ ! "$status" =~ ^OK ]] && cat $log
   fi
 
   case "$status" in
     OK*)
       ;;
-    WARN*)
-      warnings=$(($warnings+1))
-      ;;
     ERROR*)
       errors=$(($errors+1))
       ;;
@@ -65,6 +75,4 @@ for repo in $(find $GHE_SNAPSHOT_DIR/repositories/ -type d -name \*.git); do
 
 done
 
-echo "* Total repos: $repos"
-echo "* Errors:      $errors"
-echo "* Warnings:    $warnings"
+echo "* Repos verified: $repos, Errors: $errors, Took: $(($(date +%s) - $t_start))s"
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 5b7d53e9a..54f86bab4 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -49,13 +49,15 @@ fi
 mkdir "$GHE_REMOTE_DATA_USER_DIR/repositories"
 cd "$GHE_REMOTE_DATA_USER_DIR/repositories"
 mkdir alice bob
-mkdir alice/repo1.git alice/repo2.git bob/repo3.git
+mkdir alice/repo1.git alice/repo2.git bob/repo3.git alice/broken.git
 
 # Initialize test repositories with a fake commit
 for repo in */*.git; do
     git init -q --bare "$repo"
     git --git-dir="$repo" --work-tree=. commit -q --allow-empty -m 'test commit'
 done
+# Break a repo to test fsck
+rm -f alice/broken.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
 
 begin_test "ghe-backup first snapshot"
 (
@@ -279,3 +281,18 @@ begin_test "ghe-backup empty hookshot directory"
   [ ! "$(grep "[l]ink-dest arg does not exist" $TRASHDIR/out)" ]
 )
 end_test
+
+begin_test "ghe-backup fsck"
+(
+  set -e
+
+  export GHE_BACKUP_FSCK=yes
+  ghe-backup | grep -q "Repos verified: 4, Errors: 1, Took: 0s"
+  # Verbose mode disabled by default
+  ! ghe-backup | grep -q "missing tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904"
+  ghe-backup -v | grep -q "missing tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904"
+
+  export GHE_BACKUP_FSCK=no
+  ! ghe-backup | grep -q "Repos verified:"
+)
+end_test

From 3ae0ac287fbaa47997876f313eedc75ef022ebe2 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 21:38:40 +0200
Subject: [PATCH 225/288] Remove tmp log file

---
 share/github-backup-utils/ghe-backup-fsck | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index e9574867e..6fcefd360 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -76,3 +76,5 @@ for repo in $(find $sdir/repositories/ -type d -name \*.git); do
 done
 
 echo "* Repos verified: $repos, Errors: $errors, Took: $(($(date +%s) - $t_start))s"
+
+rm -f $log

From 101e4ff78f21006023d63b1afddf4ba080697d87 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 13 Apr 2016 21:42:02 +0200
Subject: [PATCH 226/288] Do not grep the time, makes things flaky

---
 test/test-ghe-backup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 54f86bab4..c1ee2c806 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -287,7 +287,7 @@ begin_test "ghe-backup fsck"
   set -e
 
   export GHE_BACKUP_FSCK=yes
-  ghe-backup | grep -q "Repos verified: 4, Errors: 1, Took: 0s"
+  ghe-backup | grep -q "Repos verified: 4, Errors: 1, Took:"
   # Verbose mode disabled by default
   ! ghe-backup | grep -q "missing tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904"
   ghe-backup -v | grep -q "missing tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904"

From be03df8f1855ab777f46889ce0a6f55d851780af Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 14 Apr 2016 14:09:00 +0200
Subject: [PATCH 227/288] Quiet dd

You'll see some noise otherwise:

```
./bin/ghe-backup
Starting backup of ghe.io in snapshot 20160414T140703
Connect ghe.io:122 OK (v2.6.0)
0+1 records in
0+1 records out
47 bytes (47 B) copied, 0.100804 s, 0.5 kB/s
```
---
 share/github-backup-utils/ghe-backup-store-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
index 3428ae114..d87752cc5 100755
--- a/share/github-backup-utils/ghe-backup-store-version
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -14,5 +14,5 @@ if [ -d .git ]; 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"
+  ghe-ssh "$GHE_HOSTNAME" -- "sudo dd of=$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version >/dev/null 2>&1"
 fi

From c3bd3ab4e12705a1e4dfb8e2d61888c01fb282a7 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 14 Apr 2016 16:50:03 +0200
Subject: [PATCH 228/288] Cat fsck log when verbose is enabled only

---
 share/github-backup-utils/ghe-backup-fsck | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index 6fcefd360..42f5270c0 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -62,7 +62,7 @@ for repo in $(find $sdir/repositories/ -type d -name \*.git); do
 
   if [[ ! "$status" =~ ^OK ]] || [ $elapsed_time -gt 5 ]; then
     echo "$status ${elapsed_time}s" 1>&3
-    [[ ! "$status" =~ ^OK ]] && cat $log
+    [ -n "$GHE_VERBOSE" ] && cat $log
   fi
 
   case "$status" in

From 38925c6cdb02704ba3bc44cf5109e08dda41e6ca Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 15 Apr 2016 17:44:23 +1000
Subject: [PATCH 229/288] Move GHE_BACKUP_ROOT to ghe-backup-config

---
 bin/ghe-backup                                        |  3 +--
 bin/ghe-host-check                                    |  5 ++---
 bin/ghe-restore                                       |  3 +--
 share/github-backup-utils/ghe-backup-alambic-cluster  |  3 +--
 share/github-backup-utils/ghe-backup-config           | 11 ++++++-----
 share/github-backup-utils/ghe-backup-es-audit-log     |  3 +--
 share/github-backup-utils/ghe-backup-es-hookshot      |  3 +--
 share/github-backup-utils/ghe-backup-es-rsync         |  3 +--
 share/github-backup-utils/ghe-backup-es-tarball       |  3 +--
 share/github-backup-utils/ghe-backup-pages-cluster    |  3 +--
 share/github-backup-utils/ghe-backup-pages-rsync      |  3 +--
 share/github-backup-utils/ghe-backup-pages-tarball    |  3 +--
 share/github-backup-utils/ghe-backup-redis            |  3 +--
 share/github-backup-utils/ghe-backup-redis-cluster    |  3 +--
 .../ghe-backup-repositories-cluster                   |  3 +--
 .../github-backup-utils/ghe-backup-repositories-rsync |  3 +--
 .../ghe-backup-repositories-tarball                   |  3 +--
 share/github-backup-utils/ghe-backup-settings         |  3 +--
 share/github-backup-utils/ghe-backup-store-version    |  3 +--
 share/github-backup-utils/ghe-backup-userdata         |  3 +--
 share/github-backup-utils/ghe-gc-disable              |  3 +--
 share/github-backup-utils/ghe-gc-enable               |  3 +--
 .../github-backup-utils/ghe-maintenance-mode-disable  |  3 +--
 share/github-backup-utils/ghe-maintenance-mode-enable |  3 +--
 share/github-backup-utils/ghe-maintenance-mode-status |  3 +--
 share/github-backup-utils/ghe-prune-snapshots         |  3 +--
 share/github-backup-utils/ghe-restore-alambic-cluster |  3 +--
 share/github-backup-utils/ghe-restore-es-audit-log    |  3 +--
 share/github-backup-utils/ghe-restore-es-rsync        |  3 +--
 share/github-backup-utils/ghe-restore-es-tarball      |  3 +--
 share/github-backup-utils/ghe-restore-pages-dpages    |  3 +--
 share/github-backup-utils/ghe-restore-pages-rsync     |  3 +--
 share/github-backup-utils/ghe-restore-pages-tarball   |  3 +--
 .../github-backup-utils/ghe-restore-repositories-dgit |  3 +--
 .../github-backup-utils/ghe-restore-repositories-gist |  3 +--
 .../ghe-restore-repositories-rsync                    |  3 +--
 .../ghe-restore-repositories-tarball                  |  3 +--
 share/github-backup-utils/ghe-restore-settings        |  3 +--
 share/github-backup-utils/ghe-restore-snapshot-path   |  3 +--
 share/github-backup-utils/ghe-restore-userdata        |  3 +--
 share/github-backup-utils/ghe-rsync                   |  3 +--
 share/github-backup-utils/ghe-ssh                     |  3 +--
 test/testlib.sh                                       |  3 +--
 43 files changed, 49 insertions(+), 90 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index a3ad5f1da..c253ca907 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -8,8 +8,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 
 # Used to record failed backup steps
 failures=
diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 20d2aa49c..8e5f7d441 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -5,8 +5,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 
 # Use the host provided on the command line if provided, or fallback on the
 # $GHE_HOSTNAME configured in backup.config when not present.
@@ -51,7 +50,7 @@ if [ $rc -ne 0 ]; then
             ;;
         1)
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
-                exec "$GHE_BACKUP_ROOT/bin/$(basename $0)" "$hostname:122"
+                exec "${BASH_SOURCE[0]}" "$hostname:122"
             else
                 echo "$output" 1>&2
             fi
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 3136c6e62..574a24831 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -22,8 +22,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 
 # Parse arguments
 restore_settings=false
diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
index 9af18af32..88e11a1f0 100755
--- a/share/github-backup-utils/ghe-backup-alambic-cluster
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 14301c102..882692704 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # Usage: . ghe-backup-config
 # GitHub Enterprise backup shell configuration.
 #
@@ -7,15 +7,16 @@
 #
 # All commands in share/github-backup-utils/ should start with the following:
 #
-#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+#     . $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 #
 # And all commands in bin/ should start with the following:
 #
-#     export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
-#     . $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+#     . $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 #
 
+# Assume this script lives in share/github-backup-utils/ when setting the root
+GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+
 # Get the version from the version file.
 BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/share/github-backup-utils/version)"
 
diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index 37c1c7ef3..719725ea8 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-hookshot b/share/github-backup-utils/ghe-backup-es-hookshot
index ac97e4b03..2d16736da 100755
--- a/share/github-backup-utils/ghe-backup-es-hookshot
+++ b/share/github-backup-utils/ghe-backup-es-hookshot
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-rsync b/share/github-backup-utils/ghe-backup-es-rsync
index f684c6576..e3722fd18 100755
--- a/share/github-backup-utils/ghe-backup-es-rsync
+++ b/share/github-backup-utils/ghe-backup-es-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-tarball b/share/github-backup-utils/ghe-backup-es-tarball
index 537c23e32..25d9222d7 100755
--- a/share/github-backup-utils/ghe-backup-es-tarball
+++ b/share/github-backup-utils/ghe-backup-es-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Snapshot all Elasticsearch data or fake it when no /data/elasticsearch
 # directory exists.
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
index ee10b3bd1..55c912407 100755
--- a/share/github-backup-utils/ghe-backup-pages-cluster
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-pages-rsync b/share/github-backup-utils/ghe-backup-pages-rsync
index 4bf492c34..e2d541319 100755
--- a/share/github-backup-utils/ghe-backup-pages-rsync
+++ b/share/github-backup-utils/ghe-backup-pages-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/pages"
diff --git a/share/github-backup-utils/ghe-backup-pages-tarball b/share/github-backup-utils/ghe-backup-pages-tarball
index 0b83c401e..574ee7c93 100755
--- a/share/github-backup-utils/ghe-backup-pages-tarball
+++ b/share/github-backup-utils/ghe-backup-pages-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Snapshot all Pages data or fake it when no /data/pages directory exists.
 echo '
diff --git a/share/github-backup-utils/ghe-backup-redis b/share/github-backup-utils/ghe-backup-redis
index b3679a5e5..d21623315 100755
--- a/share/github-backup-utils/ghe-backup-redis
+++ b/share/github-backup-utils/ghe-backup-redis
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-redis-cluster b/share/github-backup-utils/ghe-backup-redis-cluster
index a106ffb1d..f2718dd17 100755
--- a/share/github-backup-utils/ghe-backup-redis-cluster
+++ b/share/github-backup-utils/ghe-backup-redis-cluster
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 4bd926764..39cd428a7 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -32,8 +32,7 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Split host:port into parts
 port=$(ssh_port_part "$GHE_HOSTNAME")
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 0375d8ab7..bb7ba3b82 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -32,8 +32,7 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-tarball b/share/github-backup-utils/ghe-backup-repositories-tarball
index 67b9de66a..2f083a974 100755
--- a/share/github-backup-utils/ghe-backup-repositories-tarball
+++ b/share/github-backup-utils/ghe-backup-repositories-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Snapshot all Git repository data
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-export-repositories' > "$GHE_SNAPSHOT_DIR"/repositories.tar
diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index 664b52a27..9c1caf40b 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$host"
diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
index 3428ae114..cff351687 100755
--- a/share/github-backup-utils/ghe-backup-store-version
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 if [ -d .git ]; then
   version_info="$BACKUP_UTILS_VERSION"
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 013dd4857..95390dbae 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -6,8 +6,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Verify rsync is available.
 if ! rsync --version 1>/dev/null 2>&1; then
diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
index 468de2585..fd3065007 100755
--- a/share/github-backup-utils/ghe-gc-disable
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
index 936114ce7..5ecf4e1bc 100755
--- a/share/github-backup-utils/ghe-gc-enable
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-maintenance-mode-disable b/share/github-backup-utils/ghe-maintenance-mode-disable
index 69c89bc53..b624746aa 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-disable
+++ b/share/github-backup-utils/ghe-maintenance-mode-disable
@@ -5,8 +5,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-maintenance-mode-enable b/share/github-backup-utils/ghe-maintenance-mode-enable
index ec7cdf666..ab56a70ab 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-enable
+++ b/share/github-backup-utils/ghe-maintenance-mode-enable
@@ -6,8 +6,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Parse args
 wait_procs=true
diff --git a/share/github-backup-utils/ghe-maintenance-mode-status b/share/github-backup-utils/ghe-maintenance-mode-status
index e349e43f3..aa76f6a9b 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-status
+++ b/share/github-backup-utils/ghe-maintenance-mode-status
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Parse args
 while true; do
diff --git a/share/github-backup-utils/ghe-prune-snapshots b/share/github-backup-utils/ghe-prune-snapshots
index eebfea307..e6270539f 100755
--- a/share/github-backup-utils/ghe-prune-snapshots
+++ b/share/github-backup-utils/ghe-prune-snapshots
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # First prune all incomplete / failed snapshot directories
 prune_dirs="$(ls -1 "$GHE_DATA_DIR"/[0-9]*/incomplete 2>/dev/null || true)"
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index c9ecbe8fc..87d196189 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
index 7e634ca02..f0fded87c 100755
--- a/share/github-backup-utils/ghe-restore-es-audit-log
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 1 ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-rsync b/share/github-backup-utils/ghe-restore-es-rsync
index 5568c39a3..bfd4006f0 100755
--- a/share/github-backup-utils/ghe-restore-es-rsync
+++ b/share/github-backup-utils/ghe-restore-es-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-tarball b/share/github-backup-utils/ghe-restore-es-tarball
index 13779fe49..fc50f6ac7 100755
--- a/share/github-backup-utils/ghe-restore-es-tarball
+++ b/share/github-backup-utils/ghe-restore-es-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
index c9410c700..419b61627 100755
--- a/share/github-backup-utils/ghe-restore-pages-dpages
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-rsync b/share/github-backup-utils/ghe-restore-pages-rsync
index 723562e34..d68e8bcb4 100755
--- a/share/github-backup-utils/ghe-restore-pages-rsync
+++ b/share/github-backup-utils/ghe-restore-pages-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-tarball b/share/github-backup-utils/ghe-restore-pages-tarball
index 1aba55aad..2f8a9766a 100755
--- a/share/github-backup-utils/ghe-restore-pages-tarball
+++ b/share/github-backup-utils/ghe-restore-pages-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index 8a0169332..0da1a7f9d 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index 1552770ea..84d59a569 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index bb360d143..302184b9c 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-tarball b/share/github-backup-utils/ghe-restore-repositories-tarball
index 17c1b473f..78db05341 100755
--- a/share/github-backup-utils/ghe-restore-repositories-tarball
+++ b/share/github-backup-utils/ghe-restore-repositories-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index 01cf747d9..d29d77b94 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-snapshot-path b/share/github-backup-utils/ghe-restore-snapshot-path
index 04cf92c4b..a82e57bf5 100755
--- a/share/github-backup-utils/ghe-restore-snapshot-path
+++ b/share/github-backup-utils/ghe-restore-snapshot-path
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 if [ -n "$1" ]; then
   GHE_RESTORE_SNAPSHOT="$(basename "$1")"
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index c8fc5c492..6670f7aa5 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -6,8 +6,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 2 ] && print_usage
diff --git a/share/github-backup-utils/ghe-rsync b/share/github-backup-utils/ghe-rsync
index 1613cd069..f1abefb39 100755
--- a/share/github-backup-utils/ghe-rsync
+++ b/share/github-backup-utils/ghe-rsync
@@ -8,8 +8,7 @@
 set -o pipefail
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Filter vanished file warnings from both stdout (rsync versions < 3.x) and
 # stderr (rsync versions >= 3.x). The complex redirections are necessary to
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index af1d29d12..0f8a73082 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-export GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 opts="$GHE_EXTRA_SSH_OPTS"
 while true; do
diff --git a/test/testlib.sh b/test/testlib.sh
index be9bc2e2c..0e83104c8 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -47,8 +47,7 @@ export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the
 # remote version established above or in the environment.
-export GHE_BACKUP_ROOT=$ROOTDIR
-. $GHE_BACKUP_ROOT/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 ghe_parse_remote_version "$GHE_TEST_REMOTE_VERSION"
 ghe_remote_version_config "$GHE_TEST_REMOTE_VERSION"
 

From 9ad3a9944e23b7316b757c4e7c5612bb56b140a1 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 15 Apr 2016 18:06:39 +1000
Subject: [PATCH 230/288] Fix ghe-host-check

---
 bin/ghe-host-check | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 8e5f7d441..992b28ac8 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -37,7 +37,7 @@ if [ $rc -ne 0 ]; then
     case $rc in
         255)
             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"
+                exec "$(basename $0)" "$hostname:122"
             fi
 
             echo "$output" 1>&2
@@ -50,7 +50,7 @@ if [ $rc -ne 0 ]; then
             ;;
         1)
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
-                exec "${BASH_SOURCE[0]}" "$hostname:122"
+                exec "$(basename $0)" "$hostname:122"
             else
                 echo "$output" 1>&2
             fi

From 5b5a0e9ddbd85ba6da24c235e99b0b385f1176f2 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 15 Apr 2016 20:15:36 +1000
Subject: [PATCH 231/288] Fix ghe-backup-store-version paths

---
 share/github-backup-utils/ghe-backup-store-version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
index 607f06bbe..5826af85a 100755
--- a/share/github-backup-utils/ghe-backup-store-version
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -6,9 +6,9 @@ set -e
 # Bring in the backup configuration
 . $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
-if [ -d .git ]; then
+if [ -d $GHE_BACKUP_ROOT/.git ]; then
   version_info="$BACKUP_UTILS_VERSION"
-  ref=$(git rev-parse HEAD || true)
+  ref=$(git --git-dir=$GHE_BACKUP_ROOT/.git rev-parse HEAD || true)
   if [ -n "$ref" ]; then
     version_info="$version_info:$ref"
   fi

From de9029e71c1c3c33827169d47f90e989108590c7 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 15 Apr 2016 20:32:51 +1000
Subject: [PATCH 232/288] Check home directory for config

---
 share/github-backup-utils/ghe-backup-config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 4fd3f6954..a1d907eb1 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -46,7 +46,7 @@ GHE_HOSTNAME_PRESERVE="$GHE_HOSTNAME"
 # Source in the backup config file from the local working copy location first
 # and then falling back to the system location.
 config_found=false
-for f in "$GHE_BACKUP_CONFIG" "/etc/github-backup-utils/backup.config"; do
+for f in "$GHE_BACKUP_CONFIG" "$HOME/github-backup-utils/backup.config" "/etc/github-backup-utils/backup.config"; do
     if [ -f "$f" ]; then
         GHE_BACKUP_CONFIG="$f"
         . "$GHE_BACKUP_CONFIG"

From 8dacf7fa2d6547b2072bb18ea24c6729ac3c5304 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 15 Apr 2016 20:42:38 +1000
Subject: [PATCH 233/288] Add new config location to error

---
 share/github-backup-utils/ghe-backup-config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index a1d907eb1..b63aad537 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -59,6 +59,7 @@ done
 if ! $config_found; then
     echo "Error: No backup configuration file found. Tried:" 1>&2
     echo " - $GHE_BACKUP_CONFIG" 1>&2
+    echo " - $HOME/github-backup-utils/backup.config" 1>&2
     echo " - /etc/github-backup-utils/backup.config" 1>&2
     exit 2
 fi

From 162005911c963b9ea6cbbd6c0c722b62bacba969 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Fri, 15 Apr 2016 22:48:01 +1000
Subject: [PATCH 234/288] Unify config selection

---
 share/github-backup-utils/ghe-backup-config | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index b63aad537..43f8c953b 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -21,9 +21,6 @@ BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 
-# The backup config file. This may be set in the environment.
-: ${GHE_BACKUP_CONFIG:="$GHE_BACKUP_ROOT/backup.config"}
-
 # Parse out -v (verbose) argument
 if [ "$1" = "-v" ]; then
     GHE_VERBOSE=true
@@ -43,10 +40,11 @@ fi
 # backup.config value when set.
 GHE_HOSTNAME_PRESERVE="$GHE_HOSTNAME"
 
-# Source in the backup config file from the local working copy location first
-# and then falling back to the system location.
+# Source in the backup config file from the copy specified in the environment
+# first and then fall back to the backup-utils root, home directory and system.
 config_found=false
-for f in "$GHE_BACKUP_CONFIG" "$HOME/github-backup-utils/backup.config" "/etc/github-backup-utils/backup.config"; do
+for f in "$GHE_BACKUP_CONFIG" "$GHE_BACKUP_ROOT/backup.config" \
+  "$HOME/github-backup-utils/backup.config" "/etc/github-backup-utils/backup.config"; do
     if [ -f "$f" ]; then
         GHE_BACKUP_CONFIG="$f"
         . "$GHE_BACKUP_CONFIG"
@@ -58,7 +56,8 @@ done
 # Check that the config file exists before we source it in.
 if ! $config_found; then
     echo "Error: No backup configuration file found. Tried:" 1>&2
-    echo " - $GHE_BACKUP_CONFIG" 1>&2
+    [ -n "$GHE_BACKUP_CONFIG" ] && echo " - $GHE_BACKUP_CONFIG" 1>&2
+    echo " - $GHE_BACKUP_ROOT/backup.config" 1>&2
     echo " - $HOME/github-backup-utils/backup.config" 1>&2
     echo " - /etc/github-backup-utils/backup.config" 1>&2
     exit 2

From ed3139e7b25e039c213cc3ed8b17dfe13183e813 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Sat, 16 Apr 2016 12:40:21 +1000
Subject: [PATCH 235/288] Hidden directory for config

---
 share/github-backup-utils/ghe-backup-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 43f8c953b..386fbc894 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -44,7 +44,7 @@ GHE_HOSTNAME_PRESERVE="$GHE_HOSTNAME"
 # first and then fall back to the backup-utils root, home directory and system.
 config_found=false
 for f in "$GHE_BACKUP_CONFIG" "$GHE_BACKUP_ROOT/backup.config" \
-  "$HOME/github-backup-utils/backup.config" "/etc/github-backup-utils/backup.config"; do
+  "$HOME/.github-backup-utils/backup.config" "/etc/github-backup-utils/backup.config"; do
     if [ -f "$f" ]; then
         GHE_BACKUP_CONFIG="$f"
         . "$GHE_BACKUP_CONFIG"
@@ -58,7 +58,7 @@ if ! $config_found; then
     echo "Error: No backup configuration file found. Tried:" 1>&2
     [ -n "$GHE_BACKUP_CONFIG" ] && echo " - $GHE_BACKUP_CONFIG" 1>&2
     echo " - $GHE_BACKUP_ROOT/backup.config" 1>&2
-    echo " - $HOME/github-backup-utils/backup.config" 1>&2
+    echo " - $HOME/.github-backup-utils/backup.config" 1>&2
     echo " - /etc/github-backup-utils/backup.config" 1>&2
     exit 2
 fi

From 25b7d6d0ba0157fb9171db61992ffb18189a7852 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <sergio.rubio@github.com>
Date: Tue, 19 Apr 2016 18:08:00 +0200
Subject: [PATCH 236/288] Revert "Don't change working directory when loading
 in ghe-backup-config"

---
 bin/ghe-backup                                   |  3 ++-
 bin/ghe-host-check                               |  9 +++++----
 bin/ghe-restore                                  |  5 +++--
 .../ghe-backup-alambic-cluster                   |  3 ++-
 share/github-backup-utils/ghe-backup-config      | 16 +++++++---------
 .../github-backup-utils/ghe-backup-es-audit-log  |  3 ++-
 share/github-backup-utils/ghe-backup-es-hookshot |  3 ++-
 share/github-backup-utils/ghe-backup-es-rsync    |  3 ++-
 share/github-backup-utils/ghe-backup-es-tarball  |  3 ++-
 .../github-backup-utils/ghe-backup-pages-cluster |  3 ++-
 share/github-backup-utils/ghe-backup-pages-rsync |  3 ++-
 .../github-backup-utils/ghe-backup-pages-tarball |  3 ++-
 share/github-backup-utils/ghe-backup-redis       |  3 ++-
 .../github-backup-utils/ghe-backup-redis-cluster |  3 ++-
 .../ghe-backup-repositories-cluster              |  3 ++-
 .../ghe-backup-repositories-rsync                |  3 ++-
 .../ghe-backup-repositories-tarball              |  3 ++-
 share/github-backup-utils/ghe-backup-settings    |  3 ++-
 .../github-backup-utils/ghe-backup-store-version |  7 ++++---
 share/github-backup-utils/ghe-backup-userdata    |  3 ++-
 share/github-backup-utils/ghe-gc-disable         |  3 ++-
 share/github-backup-utils/ghe-gc-enable          |  3 ++-
 .../ghe-maintenance-mode-disable                 |  3 ++-
 .../ghe-maintenance-mode-enable                  |  3 ++-
 .../ghe-maintenance-mode-status                  |  3 ++-
 share/github-backup-utils/ghe-prune-snapshots    |  3 ++-
 .../ghe-restore-alambic-cluster                  |  3 ++-
 .../github-backup-utils/ghe-restore-es-audit-log |  3 ++-
 share/github-backup-utils/ghe-restore-es-rsync   |  3 ++-
 share/github-backup-utils/ghe-restore-es-tarball |  3 ++-
 .../github-backup-utils/ghe-restore-pages-dpages |  3 ++-
 .../github-backup-utils/ghe-restore-pages-rsync  |  3 ++-
 .../ghe-restore-pages-tarball                    |  3 ++-
 .../ghe-restore-repositories-dgit                |  3 ++-
 .../ghe-restore-repositories-gist                |  3 ++-
 .../ghe-restore-repositories-rsync               |  3 ++-
 .../ghe-restore-repositories-tarball             |  3 ++-
 share/github-backup-utils/ghe-restore-settings   |  3 ++-
 .../ghe-restore-snapshot-path                    |  6 ++++--
 share/github-backup-utils/ghe-restore-userdata   |  3 ++-
 share/github-backup-utils/ghe-rsync              |  3 ++-
 share/github-backup-utils/ghe-ssh                |  3 ++-
 test/testlib.sh                                  |  2 +-
 43 files changed, 98 insertions(+), 58 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index bc5d75eda..814e9b32a 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -8,7 +8,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+cd $(dirname "$0")/..
+. share/github-backup-utils/ghe-backup-config
 
 # Used to record failed backup steps
 failures=
diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 992b28ac8..48e773bfd 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -4,8 +4,9 @@
 #/ provided, the $GHE_HOSTNAME configured in backup.config is assumed.
 set -e
 
-# Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration.
+cd $(dirname "$0")/..
+. share/github-backup-utils/ghe-backup-config
 
 # Use the host provided on the command line if provided, or fallback on the
 # $GHE_HOSTNAME configured in backup.config when not present.
@@ -37,7 +38,7 @@ if [ $rc -ne 0 ]; then
     case $rc in
         255)
             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 "$(basename $0)" "$hostname:122"
+                exec "bin/$(basename $0)" "$hostname:122"
             fi
 
             echo "$output" 1>&2
@@ -50,7 +51,7 @@ if [ $rc -ne 0 ]; then
             ;;
         1)
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
-                exec "$(basename $0)" "$hostname:122"
+                exec "bin/$(basename $0)" "$hostname:122"
             else
                 echo "$output" 1>&2
             fi
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 574a24831..0013ddb0e 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -21,8 +21,9 @@
 #/ <https://enterprise.github.com/help/articles/adding-an-ssh-key-for-shell-access>
 set -e
 
-# Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration.
+cd $(dirname "$0")/..
+. share/github-backup-utils/ghe-backup-config
 
 # Parse arguments
 restore_settings=false
diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
index 88e11a1f0..a965411a0 100755
--- a/share/github-backup-utils/ghe-backup-alambic-cluster
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 46c975085..386fbc894 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -5,20 +5,18 @@
 # This file is sourced by the various utilities under bin and share/github-backup-utils to
 # load in backup configuration and ensure things are configured properly.
 #
-# All commands in share/github-backup-utils/ should start with the following:
+# All commands should start with the following:
 #
-#     . $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
-#
-# And all commands in bin/ should start with the following:
-#
-#     . $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+#     cd $(dirname "$0")/../..
+#     . share/github-backup-utils/ghe-backup-config
 #
 
-# Assume this script lives in share/github-backup-utils/ when setting the root
-GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+# Assume the current directory is the root. This should be fine so long as all
+# scripts source us in according to the instructions above.
+GHE_BACKUP_ROOT="$(pwd)"
 
 # Get the version from the version file.
-BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/share/github-backup-utils/version)"
+BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
 
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index 719725ea8..27268ca1f 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-hookshot b/share/github-backup-utils/ghe-backup-es-hookshot
index 2d16736da..9ec41f46a 100755
--- a/share/github-backup-utils/ghe-backup-es-hookshot
+++ b/share/github-backup-utils/ghe-backup-es-hookshot
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-rsync b/share/github-backup-utils/ghe-backup-es-rsync
index e3722fd18..50cb3606c 100755
--- a/share/github-backup-utils/ghe-backup-es-rsync
+++ b/share/github-backup-utils/ghe-backup-es-rsync
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-tarball b/share/github-backup-utils/ghe-backup-es-tarball
index 25d9222d7..febfdb718 100755
--- a/share/github-backup-utils/ghe-backup-es-tarball
+++ b/share/github-backup-utils/ghe-backup-es-tarball
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Snapshot all Elasticsearch data or fake it when no /data/elasticsearch
 # directory exists.
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
index 55c912407..e84907548 100755
--- a/share/github-backup-utils/ghe-backup-pages-cluster
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-pages-rsync b/share/github-backup-utils/ghe-backup-pages-rsync
index e2d541319..318562a91 100755
--- a/share/github-backup-utils/ghe-backup-pages-rsync
+++ b/share/github-backup-utils/ghe-backup-pages-rsync
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/pages"
diff --git a/share/github-backup-utils/ghe-backup-pages-tarball b/share/github-backup-utils/ghe-backup-pages-tarball
index 574ee7c93..9c56620ef 100755
--- a/share/github-backup-utils/ghe-backup-pages-tarball
+++ b/share/github-backup-utils/ghe-backup-pages-tarball
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Snapshot all Pages data or fake it when no /data/pages directory exists.
 echo '
diff --git a/share/github-backup-utils/ghe-backup-redis b/share/github-backup-utils/ghe-backup-redis
index d21623315..2ebe3cd3a 100755
--- a/share/github-backup-utils/ghe-backup-redis
+++ b/share/github-backup-utils/ghe-backup-redis
@@ -9,7 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-redis-cluster b/share/github-backup-utils/ghe-backup-redis-cluster
index f2718dd17..fb4e7e13f 100755
--- a/share/github-backup-utils/ghe-backup-redis-cluster
+++ b/share/github-backup-utils/ghe-backup-redis-cluster
@@ -9,7 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index 20dbffd7c..cb84acf69 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -32,7 +32,8 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Split host:port into parts
 port=$(ssh_port_part "$GHE_HOSTNAME")
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index 3a431fda2..ace8f6d74 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -32,7 +32,8 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-tarball b/share/github-backup-utils/ghe-backup-repositories-tarball
index 2f083a974..87f695608 100755
--- a/share/github-backup-utils/ghe-backup-repositories-tarball
+++ b/share/github-backup-utils/ghe-backup-repositories-tarball
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Snapshot all Git repository data
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-export-repositories' > "$GHE_SNAPSHOT_DIR"/repositories.tar
diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index 9c1caf40b..25e6d7ae7 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -4,7 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$host"
diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
index 5826af85a..d87752cc5 100755
--- a/share/github-backup-utils/ghe-backup-store-version
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -4,11 +4,12 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
-if [ -d $GHE_BACKUP_ROOT/.git ]; then
+if [ -d .git ]; then
   version_info="$BACKUP_UTILS_VERSION"
-  ref=$(git --git-dir=$GHE_BACKUP_ROOT/.git rev-parse HEAD || true)
+  ref=$(git rev-parse HEAD || true)
   if [ -n "$ref" ]; then
     version_info="$version_info:$ref"
   fi
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 95390dbae..0800b54d5 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -6,7 +6,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Verify rsync is available.
 if ! rsync --version 1>/dev/null 2>&1; then
diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
index fd3065007..94cb92ec9 100755
--- a/share/github-backup-utils/ghe-gc-disable
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -9,7 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
index 5ecf4e1bc..6fd788b31 100755
--- a/share/github-backup-utils/ghe-gc-enable
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -9,7 +9,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-maintenance-mode-disable b/share/github-backup-utils/ghe-maintenance-mode-disable
index b624746aa..9c04cff2c 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-disable
+++ b/share/github-backup-utils/ghe-maintenance-mode-disable
@@ -5,7 +5,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-maintenance-mode-enable b/share/github-backup-utils/ghe-maintenance-mode-enable
index ab56a70ab..74673e402 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-enable
+++ b/share/github-backup-utils/ghe-maintenance-mode-enable
@@ -6,7 +6,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Parse args
 wait_procs=true
diff --git a/share/github-backup-utils/ghe-maintenance-mode-status b/share/github-backup-utils/ghe-maintenance-mode-status
index aa76f6a9b..2922989cc 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-status
+++ b/share/github-backup-utils/ghe-maintenance-mode-status
@@ -4,7 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Parse args
 while true; do
diff --git a/share/github-backup-utils/ghe-prune-snapshots b/share/github-backup-utils/ghe-prune-snapshots
index e6270539f..051fd7d75 100755
--- a/share/github-backup-utils/ghe-prune-snapshots
+++ b/share/github-backup-utils/ghe-prune-snapshots
@@ -4,7 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # First prune all incomplete / failed snapshot directories
 prune_dirs="$(ls -1 "$GHE_DATA_DIR"/[0-9]*/incomplete 2>/dev/null || true)"
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index 87d196189..a20f5f6b5 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
index f0fded87c..7014d0332 100755
--- a/share/github-backup-utils/ghe-restore-es-audit-log
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 1 ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-rsync b/share/github-backup-utils/ghe-restore-es-rsync
index bfd4006f0..f8d93af88 100755
--- a/share/github-backup-utils/ghe-restore-es-rsync
+++ b/share/github-backup-utils/ghe-restore-es-rsync
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-tarball b/share/github-backup-utils/ghe-restore-es-tarball
index fc50f6ac7..e876b6666 100755
--- a/share/github-backup-utils/ghe-restore-es-tarball
+++ b/share/github-backup-utils/ghe-restore-es-tarball
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
index 419b61627..e22fa31de 100755
--- a/share/github-backup-utils/ghe-restore-pages-dpages
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-rsync b/share/github-backup-utils/ghe-restore-pages-rsync
index d68e8bcb4..927459f44 100755
--- a/share/github-backup-utils/ghe-restore-pages-rsync
+++ b/share/github-backup-utils/ghe-restore-pages-rsync
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-tarball b/share/github-backup-utils/ghe-restore-pages-tarball
index 2f8a9766a..e7a40c840 100755
--- a/share/github-backup-utils/ghe-restore-pages-tarball
+++ b/share/github-backup-utils/ghe-restore-pages-tarball
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index 0da1a7f9d..cffd673fa 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index 84d59a569..c4b821b62 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index 302184b9c..074b24ec9 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-tarball b/share/github-backup-utils/ghe-restore-repositories-tarball
index 78db05341..1345c9f74 100755
--- a/share/github-backup-utils/ghe-restore-repositories-tarball
+++ b/share/github-backup-utils/ghe-restore-repositories-tarball
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index d29d77b94..20116ee87 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -4,7 +4,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-snapshot-path b/share/github-backup-utils/ghe-restore-snapshot-path
index a82e57bf5..18f155917 100755
--- a/share/github-backup-utils/ghe-restore-snapshot-path
+++ b/share/github-backup-utils/ghe-restore-snapshot-path
@@ -6,8 +6,10 @@
 
 set -e
 
-# Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+# Bring in the backup configuration.
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
 
 if [ -n "$1" ]; then
   GHE_RESTORE_SNAPSHOT="$(basename "$1")"
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index 6670f7aa5..7757546e3 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -6,7 +6,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 2 ] && print_usage
diff --git a/share/github-backup-utils/ghe-rsync b/share/github-backup-utils/ghe-rsync
index f1abefb39..7b4151d54 100755
--- a/share/github-backup-utils/ghe-rsync
+++ b/share/github-backup-utils/ghe-rsync
@@ -8,7 +8,8 @@
 set -o pipefail
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Filter vanished file warnings from both stdout (rsync versions < 3.x) and
 # stderr (rsync versions >= 3.x). The complex redirections are necessary to
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 0f8a73082..7cc3811ae 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 opts="$GHE_EXTRA_SSH_OPTS"
 while true; do
diff --git a/test/testlib.sh b/test/testlib.sh
index 0e83104c8..5ccc59996 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -47,7 +47,7 @@ export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the
 # remote version established above or in the environment.
-. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+. $ROOTDIR/share/github-backup-utils/ghe-backup-config
 ghe_parse_remote_version "$GHE_TEST_REMOTE_VERSION"
 ghe_remote_version_config "$GHE_TEST_REMOTE_VERSION"
 

From a9c7a42758b16b5c35c64fb073ca40f5357d30e7 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 20 Apr 2016 10:22:07 +1000
Subject: [PATCH 237/288] Revert "Revert "Don't change working directory when
 loading in ghe-backup-config""

This reverts commit 25b7d6d0ba0157fb9171db61992ffb18189a7852.
---
 bin/ghe-backup                                   |  3 +--
 bin/ghe-host-check                               |  9 ++++-----
 bin/ghe-restore                                  |  5 ++---
 .../ghe-backup-alambic-cluster                   |  3 +--
 share/github-backup-utils/ghe-backup-config      | 16 +++++++++-------
 .../github-backup-utils/ghe-backup-es-audit-log  |  3 +--
 share/github-backup-utils/ghe-backup-es-hookshot |  3 +--
 share/github-backup-utils/ghe-backup-es-rsync    |  3 +--
 share/github-backup-utils/ghe-backup-es-tarball  |  3 +--
 .../github-backup-utils/ghe-backup-pages-cluster |  3 +--
 share/github-backup-utils/ghe-backup-pages-rsync |  3 +--
 .../github-backup-utils/ghe-backup-pages-tarball |  3 +--
 share/github-backup-utils/ghe-backup-redis       |  3 +--
 .../github-backup-utils/ghe-backup-redis-cluster |  3 +--
 .../ghe-backup-repositories-cluster              |  3 +--
 .../ghe-backup-repositories-rsync                |  3 +--
 .../ghe-backup-repositories-tarball              |  3 +--
 share/github-backup-utils/ghe-backup-settings    |  3 +--
 .../github-backup-utils/ghe-backup-store-version |  7 +++----
 share/github-backup-utils/ghe-backup-userdata    |  3 +--
 share/github-backup-utils/ghe-gc-disable         |  3 +--
 share/github-backup-utils/ghe-gc-enable          |  3 +--
 .../ghe-maintenance-mode-disable                 |  3 +--
 .../ghe-maintenance-mode-enable                  |  3 +--
 .../ghe-maintenance-mode-status                  |  3 +--
 share/github-backup-utils/ghe-prune-snapshots    |  3 +--
 .../ghe-restore-alambic-cluster                  |  3 +--
 .../github-backup-utils/ghe-restore-es-audit-log |  3 +--
 share/github-backup-utils/ghe-restore-es-rsync   |  3 +--
 share/github-backup-utils/ghe-restore-es-tarball |  3 +--
 .../github-backup-utils/ghe-restore-pages-dpages |  3 +--
 .../github-backup-utils/ghe-restore-pages-rsync  |  3 +--
 .../ghe-restore-pages-tarball                    |  3 +--
 .../ghe-restore-repositories-dgit                |  3 +--
 .../ghe-restore-repositories-gist                |  3 +--
 .../ghe-restore-repositories-rsync               |  3 +--
 .../ghe-restore-repositories-tarball             |  3 +--
 share/github-backup-utils/ghe-restore-settings   |  3 +--
 .../ghe-restore-snapshot-path                    |  6 ++----
 share/github-backup-utils/ghe-restore-userdata   |  3 +--
 share/github-backup-utils/ghe-rsync              |  3 +--
 share/github-backup-utils/ghe-ssh                |  3 +--
 test/testlib.sh                                  |  2 +-
 43 files changed, 58 insertions(+), 98 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 814e9b32a..bc5d75eda 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -8,8 +8,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 
 # Used to record failed backup steps
 failures=
diff --git a/bin/ghe-host-check b/bin/ghe-host-check
index 48e773bfd..992b28ac8 100755
--- a/bin/ghe-host-check
+++ b/bin/ghe-host-check
@@ -4,9 +4,8 @@
 #/ provided, the $GHE_HOSTNAME configured in backup.config is assumed.
 set -e
 
-# Bring in the backup configuration.
-cd $(dirname "$0")/..
-. share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 
 # Use the host provided on the command line if provided, or fallback on the
 # $GHE_HOSTNAME configured in backup.config when not present.
@@ -38,7 +37,7 @@ if [ $rc -ne 0 ]; then
     case $rc in
         255)
             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"
+                exec "$(basename $0)" "$hostname:122"
             fi
 
             echo "$output" 1>&2
@@ -51,7 +50,7 @@ if [ $rc -ne 0 ]; then
             ;;
         1)
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
-                exec "bin/$(basename $0)" "$hostname:122"
+                exec "$(basename $0)" "$hostname:122"
             else
                 echo "$output" 1>&2
             fi
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 0013ddb0e..574a24831 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -21,9 +21,8 @@
 #/ <https://enterprise.github.com/help/articles/adding-an-ssh-key-for-shell-access>
 set -e
 
-# Bring in the backup configuration.
-cd $(dirname "$0")/..
-. share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 
 # Parse arguments
 restore_settings=false
diff --git a/share/github-backup-utils/ghe-backup-alambic-cluster b/share/github-backup-utils/ghe-backup-alambic-cluster
index a965411a0..88e11a1f0 100755
--- a/share/github-backup-utils/ghe-backup-alambic-cluster
+++ b/share/github-backup-utils/ghe-backup-alambic-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 386fbc894..46c975085 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -5,18 +5,20 @@
 # This file is sourced by the various utilities under bin and share/github-backup-utils to
 # load in backup configuration and ensure things are configured properly.
 #
-# All commands should start with the following:
+# All commands in share/github-backup-utils/ should start with the following:
 #
-#     cd $(dirname "$0")/../..
-#     . share/github-backup-utils/ghe-backup-config
+#     . $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+#
+# And all commands in bin/ should start with the following:
+#
+#     . $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 #
 
-# Assume the current directory is the root. This should be fine so long as all
-# scripts source us in according to the instructions above.
-GHE_BACKUP_ROOT="$(pwd)"
+# Assume this script lives in share/github-backup-utils/ when setting the root
+GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
 
 # Get the version from the version file.
-BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
+BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/share/github-backup-utils/version)"
 
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
diff --git a/share/github-backup-utils/ghe-backup-es-audit-log b/share/github-backup-utils/ghe-backup-es-audit-log
index 27268ca1f..719725ea8 100755
--- a/share/github-backup-utils/ghe-backup-es-audit-log
+++ b/share/github-backup-utils/ghe-backup-es-audit-log
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-hookshot b/share/github-backup-utils/ghe-backup-es-hookshot
index 9ec41f46a..2d16736da 100755
--- a/share/github-backup-utils/ghe-backup-es-hookshot
+++ b/share/github-backup-utils/ghe-backup-es-hookshot
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-rsync b/share/github-backup-utils/ghe-backup-es-rsync
index 50cb3606c..e3722fd18 100755
--- a/share/github-backup-utils/ghe-backup-es-rsync
+++ b/share/github-backup-utils/ghe-backup-es-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-es-tarball b/share/github-backup-utils/ghe-backup-es-tarball
index febfdb718..25d9222d7 100755
--- a/share/github-backup-utils/ghe-backup-es-tarball
+++ b/share/github-backup-utils/ghe-backup-es-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Snapshot all Elasticsearch data or fake it when no /data/elasticsearch
 # directory exists.
diff --git a/share/github-backup-utils/ghe-backup-pages-cluster b/share/github-backup-utils/ghe-backup-pages-cluster
index e84907548..55c912407 100755
--- a/share/github-backup-utils/ghe-backup-pages-cluster
+++ b/share/github-backup-utils/ghe-backup-pages-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-pages-rsync b/share/github-backup-utils/ghe-backup-pages-rsync
index 318562a91..e2d541319 100755
--- a/share/github-backup-utils/ghe-backup-pages-rsync
+++ b/share/github-backup-utils/ghe-backup-pages-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Make sure root backup dir exists if this is the first run
 mkdir -p "$GHE_SNAPSHOT_DIR/pages"
diff --git a/share/github-backup-utils/ghe-backup-pages-tarball b/share/github-backup-utils/ghe-backup-pages-tarball
index 9c56620ef..574ee7c93 100755
--- a/share/github-backup-utils/ghe-backup-pages-tarball
+++ b/share/github-backup-utils/ghe-backup-pages-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Snapshot all Pages data or fake it when no /data/pages directory exists.
 echo '
diff --git a/share/github-backup-utils/ghe-backup-redis b/share/github-backup-utils/ghe-backup-redis
index 2ebe3cd3a..d21623315 100755
--- a/share/github-backup-utils/ghe-backup-redis
+++ b/share/github-backup-utils/ghe-backup-redis
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-redis-cluster b/share/github-backup-utils/ghe-backup-redis-cluster
index fb4e7e13f..f2718dd17 100755
--- a/share/github-backup-utils/ghe-backup-redis-cluster
+++ b/share/github-backup-utils/ghe-backup-redis-cluster
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-cluster b/share/github-backup-utils/ghe-backup-repositories-cluster
index cb84acf69..20dbffd7c 100755
--- a/share/github-backup-utils/ghe-backup-repositories-cluster
+++ b/share/github-backup-utils/ghe-backup-repositories-cluster
@@ -32,8 +32,7 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Split host:port into parts
 port=$(ssh_port_part "$GHE_HOSTNAME")
diff --git a/share/github-backup-utils/ghe-backup-repositories-rsync b/share/github-backup-utils/ghe-backup-repositories-rsync
index ace8f6d74..3a431fda2 100755
--- a/share/github-backup-utils/ghe-backup-repositories-rsync
+++ b/share/github-backup-utils/ghe-backup-repositories-rsync
@@ -32,8 +32,7 @@ set -e
 #      <http://rsync.samba.org/ftp/rsync/rsync.html>
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"
diff --git a/share/github-backup-utils/ghe-backup-repositories-tarball b/share/github-backup-utils/ghe-backup-repositories-tarball
index 87f695608..2f083a974 100755
--- a/share/github-backup-utils/ghe-backup-repositories-tarball
+++ b/share/github-backup-utils/ghe-backup-repositories-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Snapshot all Git repository data
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-export-repositories' > "$GHE_SNAPSHOT_DIR"/repositories.tar
diff --git a/share/github-backup-utils/ghe-backup-settings b/share/github-backup-utils/ghe-backup-settings
index 25e6d7ae7..9c1caf40b 100755
--- a/share/github-backup-utils/ghe-backup-settings
+++ b/share/github-backup-utils/ghe-backup-settings
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$host"
diff --git a/share/github-backup-utils/ghe-backup-store-version b/share/github-backup-utils/ghe-backup-store-version
index d87752cc5..5826af85a 100755
--- a/share/github-backup-utils/ghe-backup-store-version
+++ b/share/github-backup-utils/ghe-backup-store-version
@@ -4,12 +4,11 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
-if [ -d .git ]; then
+if [ -d $GHE_BACKUP_ROOT/.git ]; then
   version_info="$BACKUP_UTILS_VERSION"
-  ref=$(git rev-parse HEAD || true)
+  ref=$(git --git-dir=$GHE_BACKUP_ROOT/.git rev-parse HEAD || true)
   if [ -n "$ref" ]; then
     version_info="$version_info:$ref"
   fi
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 0800b54d5..95390dbae 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -6,8 +6,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Verify rsync is available.
 if ! rsync --version 1>/dev/null 2>&1; then
diff --git a/share/github-backup-utils/ghe-gc-disable b/share/github-backup-utils/ghe-gc-disable
index 94cb92ec9..fd3065007 100755
--- a/share/github-backup-utils/ghe-gc-disable
+++ b/share/github-backup-utils/ghe-gc-disable
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-gc-enable b/share/github-backup-utils/ghe-gc-enable
index 6fd788b31..5ecf4e1bc 100755
--- a/share/github-backup-utils/ghe-gc-enable
+++ b/share/github-backup-utils/ghe-gc-enable
@@ -9,8 +9,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 while true; do
     case "$1" in
diff --git a/share/github-backup-utils/ghe-maintenance-mode-disable b/share/github-backup-utils/ghe-maintenance-mode-disable
index 9c04cff2c..b624746aa 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-disable
+++ b/share/github-backup-utils/ghe-maintenance-mode-disable
@@ -5,8 +5,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-maintenance-mode-enable b/share/github-backup-utils/ghe-maintenance-mode-enable
index 74673e402..ab56a70ab 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-enable
+++ b/share/github-backup-utils/ghe-maintenance-mode-enable
@@ -6,8 +6,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Parse args
 wait_procs=true
diff --git a/share/github-backup-utils/ghe-maintenance-mode-status b/share/github-backup-utils/ghe-maintenance-mode-status
index 2922989cc..aa76f6a9b 100755
--- a/share/github-backup-utils/ghe-maintenance-mode-status
+++ b/share/github-backup-utils/ghe-maintenance-mode-status
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Parse args
 while true; do
diff --git a/share/github-backup-utils/ghe-prune-snapshots b/share/github-backup-utils/ghe-prune-snapshots
index 051fd7d75..e6270539f 100755
--- a/share/github-backup-utils/ghe-prune-snapshots
+++ b/share/github-backup-utils/ghe-prune-snapshots
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # First prune all incomplete / failed snapshot directories
 prune_dirs="$(ls -1 "$GHE_DATA_DIR"/[0-9]*/incomplete 2>/dev/null || true)"
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index a20f5f6b5..87d196189 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
index 7014d0332..f0fded87c 100755
--- a/share/github-backup-utils/ghe-restore-es-audit-log
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 1 ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-rsync b/share/github-backup-utils/ghe-restore-es-rsync
index f8d93af88..bfd4006f0 100755
--- a/share/github-backup-utils/ghe-restore-es-rsync
+++ b/share/github-backup-utils/ghe-restore-es-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-es-tarball b/share/github-backup-utils/ghe-restore-es-tarball
index e876b6666..fc50f6ac7 100755
--- a/share/github-backup-utils/ghe-restore-es-tarball
+++ b/share/github-backup-utils/ghe-restore-es-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
index e22fa31de..419b61627 100755
--- a/share/github-backup-utils/ghe-restore-pages-dpages
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-rsync b/share/github-backup-utils/ghe-restore-pages-rsync
index 927459f44..d68e8bcb4 100755
--- a/share/github-backup-utils/ghe-restore-pages-rsync
+++ b/share/github-backup-utils/ghe-restore-pages-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-pages-tarball b/share/github-backup-utils/ghe-restore-pages-tarball
index e7a40c840..2f8a9766a 100755
--- a/share/github-backup-utils/ghe-restore-pages-tarball
+++ b/share/github-backup-utils/ghe-restore-pages-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index cffd673fa..0da1a7f9d 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index c4b821b62..84d59a569 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index 074b24ec9..302184b9c 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-repositories-tarball b/share/github-backup-utils/ghe-restore-repositories-tarball
index 1345c9f74..78db05341 100755
--- a/share/github-backup-utils/ghe-restore-repositories-tarball
+++ b/share/github-backup-utils/ghe-restore-repositories-tarball
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Grab the host arg
 GHE_HOSTNAME="$1"
diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index 20116ee87..d29d77b94 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -4,8 +4,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
diff --git a/share/github-backup-utils/ghe-restore-snapshot-path b/share/github-backup-utils/ghe-restore-snapshot-path
index 18f155917..a82e57bf5 100755
--- a/share/github-backup-utils/ghe-restore-snapshot-path
+++ b/share/github-backup-utils/ghe-restore-snapshot-path
@@ -6,10 +6,8 @@
 
 set -e
 
-# Bring in the backup configuration.
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
-
+# Bring in the backup configuration
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 if [ -n "$1" ]; then
   GHE_RESTORE_SNAPSHOT="$(basename "$1")"
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index 7757546e3..6670f7aa5 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -6,8 +6,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ $# -lt 2 ] && print_usage
diff --git a/share/github-backup-utils/ghe-rsync b/share/github-backup-utils/ghe-rsync
index 7b4151d54..f1abefb39 100755
--- a/share/github-backup-utils/ghe-rsync
+++ b/share/github-backup-utils/ghe-rsync
@@ -8,8 +8,7 @@
 set -o pipefail
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Filter vanished file warnings from both stdout (rsync versions < 3.x) and
 # stderr (rsync versions >= 3.x). The complex redirections are necessary to
diff --git a/share/github-backup-utils/ghe-ssh b/share/github-backup-utils/ghe-ssh
index 7cc3811ae..0f8a73082 100755
--- a/share/github-backup-utils/ghe-ssh
+++ b/share/github-backup-utils/ghe-ssh
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 opts="$GHE_EXTRA_SSH_OPTS"
 while true; do
diff --git a/test/testlib.sh b/test/testlib.sh
index 5ccc59996..0e83104c8 100644
--- a/test/testlib.sh
+++ b/test/testlib.sh
@@ -47,7 +47,7 @@ export GHE_TEST_REMOTE_VERSION
 
 # Source in the backup config and set GHE_REMOTE_XXX variables based on the
 # remote version established above or in the environment.
-. $ROOTDIR/share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
 ghe_parse_remote_version "$GHE_TEST_REMOTE_VERSION"
 ghe_remote_version_config "$GHE_TEST_REMOTE_VERSION"
 

From f22e4a5696b2233738746b63f89ff8f1a78be425 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 20 Apr 2016 10:22:51 +1000
Subject: [PATCH 238/288] Canonicalize the data directory path

---
 share/github-backup-utils/ghe-backup-config | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 46c975085..98c275aef 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -74,6 +74,10 @@ if [ -z "$GHE_HOSTNAME" ]; then
     exit 2
 fi
 
+# Canonicalize the data directory path, basing any relative paths on the
+# backup-utils root.
+GHE_DATA_DIR="$( cd "$GHE_BACKUP_ROOT" && readlink -m "$GHE_DATA_DIR" )"
+
 GHE_CREATE_DATA_DIR=${GHE_CREATE_DATA_DIR:-yes}
 
 # Check that the data directory is set and create it if it doesn't exist.

From 662d30e63d64929efc727e4f44f670b095cdd94f Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Wed, 20 Apr 2016 10:36:04 +1000
Subject: [PATCH 239/288] Update ghe-backup-fsck config include

---
 share/github-backup-utils/ghe-backup-fsck | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index 42f5270c0..164fbf749 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -5,8 +5,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 echo "Running git fsck on repos..."
 

From eafb4638cbc9c3fe2cfef6d7b9e090d3ffeda78a Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 26 Apr 2016 13:29:00 +0200
Subject: [PATCH 240/288] Don't use --no-dangling with old git versions

--[no-]dangling was added to Git 1.7.10.
---
 share/github-backup-utils/ghe-backup-fsck | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index 42f5270c0..6dbc387d3 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -21,6 +21,12 @@ repos=0
 errors=0
 log=$(mktemp)
 t_start=$(date +%s)
+if git fsck --help | grep -q '\-\-\[no-\]dangling'; then
+  git_cmd='git fsck --no-dangling'
+else
+  echo "Warning: old git version, --no-dangling not available"
+  git_cmd='git fsck'
+fi
 
 if [ -z "$sdir" ] || [ ! -d "$sdir" ]; then
   print_usage
@@ -46,11 +52,11 @@ for repo in $(find $sdir/repositories/ -type d -name \*.git); do
     fi
 
     if [ ! -f objects/info/alternates ] || grep -q '^\.\.' objects/info/alternates; then
-      git fsck --no-dangling >$log 2>&1 && {
+      $git_cmd >$log 2>&1 && {
         echo "OK $repo $nwo"; exit
       }
     else
-      GIT_ALTERNATE_OBJECT_DIRECTORIES=../network.git/objects git fsck --no-dangling >$log 2>&1 && {
+      GIT_ALTERNATE_OBJECT_DIRECTORIES=../network.git/objects $git_cmd >$log 2>&1 && {
         echo "WARN $repo $nwo (alternates absolute path)"; exit
       }
     fi

From cd6532e5c9ec4502b1cb8a17986c2dc3bdc41774 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 26 Apr 2016 14:29:01 +0200
Subject: [PATCH 241/288] Redirect stderr to /dev/null

Avoids the noise when git man pages are not available.
---
 share/github-backup-utils/ghe-backup-fsck | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index 6dbc387d3..b0d84e130 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -21,7 +21,7 @@ repos=0
 errors=0
 log=$(mktemp)
 t_start=$(date +%s)
-if git fsck --help | grep -q '\-\-\[no-\]dangling'; then
+if git fsck --help 2>/dev/null | grep -q '\-\-\[no-\]dangling'; then
   git_cmd='git fsck --no-dangling'
 else
   echo "Warning: old git version, --no-dangling not available"

From a7595f0a8c00da48ba855406fee8a4e0dd57cd40 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 26 Apr 2016 15:03:41 +0200
Subject: [PATCH 242/288] Use -h instead of --help

So git doesn't need man pages installed.
---
 share/github-backup-utils/ghe-backup-fsck | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index b0d84e130..898d04a05 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -21,7 +21,7 @@ repos=0
 errors=0
 log=$(mktemp)
 t_start=$(date +%s)
-if git fsck --help 2>/dev/null | grep -q '\-\-\[no-\]dangling'; then
+if git fsck -h | grep -q '\-\-dangling'; then
   git_cmd='git fsck --no-dangling'
 else
   echo "Warning: old git version, --no-dangling not available"

From 2342bc9912a0f665a3c686cb58824ab256df1042 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 26 Apr 2016 18:15:36 +0200
Subject: [PATCH 243/288] Update debian/changelog for 2.6.0

---
 debian/changelog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 69076592c..cc0975c14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+github-backup-utils (2.6.0) UNRELEASED; urgency=medium
+
+  * Adds support for GitHub Enterprise 2.6
+  * Adds an extra supported location for the backup configuration #197
+  * New config option to check for corrupted repositories after the backup #195
+  * General improvements and bug fixes
+
+ -- Sergio Rubio <rubiojr@github.com>  Tue, 26 Apr 2016 18:03:01 +0200
+
 github-backup-utils (2.5.2) UNRELEASED; urgency=medium
 
   * New configuration variable: GHE_CREATE_DATA_DIR #186

From 9b9a3a83f8f92d83de9326d2c6dd2824c4b42b10 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 26 Apr 2016 19:44:41 +0200
Subject: [PATCH 244/288] Mention the new config search path in the README

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 1f527009a..c1f119954 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,14 @@ download the most recent GitHub Enterprise version.
     host name. Additional options are available and documented in the
     configuration file but none are required for basic backup functionality.
 
+    * backup-utils will attempt to load the backup configuration from the following locations, in this order:
+
+      ```
+      $GHE_BACKUP_CONFIG (User configurable environment variable)
+      $GHE_BACKUP_ROOT/backup.config (Root directory of backup-utils install)
+      $HOME/.github-backup-utils/backup.config
+      /etc/github-backup-utils/backup.config
+      ```
     * In a clustering environment, the `GHE_EXTRA_SSH_OPTS` key must be configured with the `-i <abs path to private key>` SSH option.
 
  3. Add the backup host's SSH key to the GitHub appliance as an *Authorized SSH

From ded25960a45f2a0cb63a3b2caa4b3771bc2382f4 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 2 May 2016 13:09:35 +1000
Subject: [PATCH 245/288] Add relative data dir backup test

---
 test/test-ghe-backup.sh | 66 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index c1ee2c806..6a5e5d33d 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -131,7 +131,6 @@ begin_test "ghe-backup first snapshot"
 )
 end_test
 
-
 begin_test "ghe-backup subsequent snapshot"
 (
     set -e
@@ -203,6 +202,70 @@ begin_test "ghe-backup subsequent snapshot"
 )
 end_test
 
+begin_test "ghe-backup with relative data dir path"
+(
+    set -e
+
+    # wait a second for snapshot timestamp
+    sleep 1
+
+    # grab the previous snapshot number so we can compare after
+    previous_snapshot=$(ls -ld "$GHE_DATA_DIR/current" | sed 's/.* -> //')
+
+    # run it
+    GHE_DATA_DIR=$(realpath --relative-to=$ROOTDIR $GHE_DATA_DIR) ghe-backup
+
+    # check that current symlink points to new snapshot
+    this_snapshot=$(ls -ld "$GHE_DATA_DIR/current" | sed 's/.* -> //')
+    [ "$previous_snapshot" != "$this_snapshot" ]
+
+    # check that settings were backed up
+    [ "$(cat "$GHE_DATA_DIR/current/settings.json")" = "fake ghe-export-settings data" ]
+
+    # check that license was backed up
+    [ "$(cat "$GHE_DATA_DIR/current/enterprise.ghl")" = "fake license data" ]
+
+    # check that repositories directory was created
+    [ -d "$GHE_DATA_DIR/current/repositories" ]
+
+    # check that pages data was backed up
+    [ -f "$GHE_DATA_DIR/current/pages/alice/index.html" ]
+
+    # check that mysql data was backed up
+    [ "$(gzip -dc < "$GHE_DATA_DIR/current/mysql.sql.gz")" = "fake ghe-export-mysql data" ]
+
+    # check that redis data was backed up
+    [ "$(cat "$GHE_DATA_DIR/current/redis.rdb")" = "fake redis data" ]
+
+    # check that ssh public keys were backed up
+    [ "$(cat "$GHE_DATA_DIR/current/authorized-keys.json")" = "fake ghe-export-authorized-keys data" ]
+
+    # check that ssh host key was backed up
+    [ "$(cat "$GHE_DATA_DIR/current/ssh-host-keys.tar")" = "fake ghe-export-ssh-host-keys data" ]
+
+    # verify all repository data was transferred
+    diff -ru "$GHE_REMOTE_DATA_USER_DIR/repositories" "$GHE_DATA_DIR/current/repositories"
+
+    # verify all pages data was transferred
+    diff -ru "$GHE_REMOTE_DATA_USER_DIR/pages" "$GHE_DATA_DIR/current/pages"
+
+    # verify all ES data was transferred from live directory
+    diff -ru "$GHE_REMOTE_DATA_USER_DIR/elasticsearch" "$GHE_DATA_DIR/current/elasticsearch"
+
+    # verify manage-password file was backed up under v2.x VMs
+    if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        [ "$(cat "$GHE_DATA_DIR/current/manage-password")" = "fake password hash data" ]
+    fi
+
+    if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+        # verify all hookshot user data was transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
+
+        # verify all alambic assets user data was transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
+    fi
+)
+end_test
 
 begin_test "ghe-backup tarball strategy"
 (
@@ -257,7 +320,6 @@ begin_test "ghe-backup cleans up stale in-progress file"
 )
 end_test
 
-
 begin_test "ghe-backup without manage-password file"
 (
     set -e

From 63151a3914621a3bae13e9279cc7d2a400e83645 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 2 May 2016 13:13:59 +1000
Subject: [PATCH 246/288] Add hooks to relative test

---
 test/test-ghe-backup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index e0250f0a4..0fb5421ee 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -272,6 +272,9 @@ begin_test "ghe-backup with relative data dir path"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
 
+        # verify all git hooks data was transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks" "$GHE_DATA_DIR/current/git-hooks"
+
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
     fi

From a9a9a8dccc397df1863c848ee6baf45d354f60c4 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 2 May 2016 14:41:18 +1000
Subject: [PATCH 247/288] Add realpath package to .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 82488dcf2..220d45e2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,4 @@ script:
   - debuild -uc -us
 before_install: 
   - sudo apt-get update -qq
-  - sudo apt-get install -y devscripts
+  - sudo apt-get install -y devscripts realpath

From fb71d008d18df7bc6cd0b5b7b21d7fb33de86b8a Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 2 May 2016 15:22:28 +1000
Subject: [PATCH 248/288] Remove realpath dependency

---
 .travis.yml             | 4 ++--
 test/test-ghe-backup.sh | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 220d45e2d..d7d1d4ca2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 ---
 script:
   - debuild -uc -us
-before_install: 
+before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y devscripts realpath
+  - sudo apt-get install -y devscripts
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 0fb5421ee..f945adc50 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -223,8 +223,11 @@ begin_test "ghe-backup with relative data dir path"
     # grab the previous snapshot number so we can compare after
     previous_snapshot=$(ls -ld "$GHE_DATA_DIR/current" | sed 's/.* -> //')
 
+    # Change working directory to the root directory
+    cd $ROOTDIR
+
     # run it
-    GHE_DATA_DIR=$(realpath --relative-to=$ROOTDIR $GHE_DATA_DIR) ghe-backup
+    GHE_DATA_DIR=$(echo $GHE_DATA_DIR | sed 's|'$ROOTDIR'/||') ghe-backup
 
     # check that current symlink points to new snapshot
     this_snapshot=$(ls -ld "$GHE_DATA_DIR/current" | sed 's/.* -> //')

From 202c840ea463eed36548d8de06995ab6b815e5cc Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 3 May 2016 19:46:57 +1000
Subject: [PATCH 249/288] Simplify symlink test

---
 test/test-ghe-backup.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index f945adc50..6ab2b360e 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -220,18 +220,17 @@ begin_test "ghe-backup with relative data dir path"
     # wait a second for snapshot timestamp
     sleep 1
 
-    # grab the previous snapshot number so we can compare after
-    previous_snapshot=$(ls -ld "$GHE_DATA_DIR/current" | sed 's/.* -> //')
+    # generate a timestamp
+    export GHE_SNAPSHOT_TIMESTAMP="relative-$(date +"%Y%m%dT%H%M%S")"
 
-    # Change working directory to the root directory
+    # change working directory to the root directory
     cd $ROOTDIR
 
     # run it
     GHE_DATA_DIR=$(echo $GHE_DATA_DIR | sed 's|'$ROOTDIR'/||') ghe-backup
 
     # check that current symlink points to new snapshot
-    this_snapshot=$(ls -ld "$GHE_DATA_DIR/current" | sed 's/.* -> //')
-    [ "$previous_snapshot" != "$this_snapshot" ]
+    ls -ld "$GHE_DATA_DIR/current" | grep -q "$GHE_SNAPSHOT_TIMESTAMP"
 
     # check that settings were backed up
     [ "$(cat "$GHE_DATA_DIR/current/settings.json")" = "fake ghe-export-settings data" ]

From 1c6f4c950da94c0f64689aa29fa75215bfc217ca Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 3 May 2016 19:50:41 +1000
Subject: [PATCH 250/288] Additional relative tests

---
 test/test-ghe-backup.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 6ab2b360e..2b7335cf6 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -232,6 +232,14 @@ begin_test "ghe-backup with relative data dir path"
     # check that current symlink points to new snapshot
     ls -ld "$GHE_DATA_DIR/current" | grep -q "$GHE_SNAPSHOT_TIMESTAMP"
 
+    # check that the version file was written
+    [ -f "$GHE_DATA_DIR/current/version" ]
+    [ $(cat "$GHE_DATA_DIR/current/version") = "v$GHE_TEST_REMOTE_VERSION" ]
+
+    # check that the strategy file was written
+    [ -f "$GHE_DATA_DIR/current/strategy" ]
+    [ $(cat "$GHE_DATA_DIR/current/strategy") = "rsync" ]
+
     # check that settings were backed up
     [ "$(cat "$GHE_DATA_DIR/current/settings.json")" = "fake ghe-export-settings data" ]
 
@@ -280,6 +288,9 @@ begin_test "ghe-backup with relative data dir path"
         # 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
 

From 7d7e1271327c2387fd87219be225c3cb7630d2f4 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 9 May 2016 12:46:48 +0200
Subject: [PATCH 251/288] clustering: fix git-hooks restore

Wrong variable name.
---
 share/github-backup-utils/ghe-restore-git-hooks-cluster | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index 9ea62f11b..0c40dafa6 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -63,7 +63,7 @@ if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" ]; then
     -e "ssh -q $opts -p $port -F $config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
     "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" \
-    "$route:$GHE_REMOTE_DATA_USER_DIR/git-hooks" &
+    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks" &
   done
 
   for pid in $(jobs -p); do

From 5ac5639064511ad9313d4941b7e6ce3201339765 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 9 May 2016 13:33:52 +0200
Subject: [PATCH 252/288] Don't use relative path names with rsync

The $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks path is otherwise
recreated in the remote server and the git-hooks data is transfered to
the wrong directory:

```
root@ghe-test-dgit-fs3:/data/user/git-hooks# find
.
./data
./data/2.6-storage
./data/2.6-storage/current
./data/2.6-storage/current/git-hooks
./data/2.6-storage/current/git-hooks/environments
./data/2.6-storage/current/git-hooks/environments/1
./data/2.6-storage/current/git-hooks/environments/1/0
./data/2.6-storage/current/git-hooks/repos
```
---
 share/github-backup-utils/ghe-restore-git-hooks-cluster | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index 0c40dafa6..b010a24f5 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -59,11 +59,11 @@ trap 'cleanup' INT TERM EXIT
 
 if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" ]; then
   for hostname in $hostnames; do
-    ghe-rsync -aHR --delete \
+    ghe-rsync -aH --delete \
     -e "ssh -q $opts -p $port -F $config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
-    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" \
-    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks" &
+    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/" \
+    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/" &
   done
 
   for pid in $(jobs -p); do

From 30f98da517f9c83afd28c736be5b348c43a91d5d Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 16 May 2016 11:27:53 +1000
Subject: [PATCH 253/288] Document hard link requirement

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c1f119954..e8df1ceb6 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,8 @@ Backup host software requirements are modest: Linux or other modern Unix
 operating system with bash and [rsync][4] v2.6.4 or newer.
 
 The backup host must be able to establish network connections outbound to the
-GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise 2.0 or newer instances, and TCP port 22 is used for older versions (11.10.34X).
+GitHub appliance over SSH. TCP port 122 is used to backup GitHub Enterprise 2.0
+or newer instances, and TCP port 22 is used for older versions (11.10.34X).
 
 ##### Storage requirements
 
@@ -57,6 +58,9 @@ patterns of the GitHub appliance. We recommend allocating at least 5x the amount
 of storage allocated to the primary GitHub appliance for historical snapshots
 and growth over time.
 
+As Repository, Search, and Pages data is stored efficiently via hard links,
+backup snapshots must be written to a filesystem which supports hard links.
+
 ##### GitHub Enterprise version requirements
 
 The backup utilities are fully supported under GitHub Enterprise 2.0 or

From 8c0e79d3f8534996e2e7f20374103f54d2a2b2b7 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 16 May 2016 17:23:11 +1000
Subject: [PATCH 254/288] Support for systems lacking readlink -m

---
 share/github-backup-utils/ghe-backup-config | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 98c275aef..d7cfc05ce 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -74,9 +74,12 @@ if [ -z "$GHE_HOSTNAME" ]; then
     exit 2
 fi
 
-# Canonicalize the data directory path, basing any relative paths on the
-# backup-utils root.
-GHE_DATA_DIR="$( cd "$GHE_BACKUP_ROOT" && readlink -m "$GHE_DATA_DIR" )"
+# Convert the data directory path to an absolute path, basing any relative
+# paths on the backup-utils root, and using readlink, if available, to
+# canonicalize the path.
+if [ ${GHE_DATA_DIR:0:1} != "/" ]; then
+  GHE_DATA_DIR="$( cd "$GHE_BACKUP_ROOT" && readlink -m "$GHE_DATA_DIR" 2> /dev/null || echo "$GHE_BACKUP_ROOT/$GHE_DATA_DIR" )"
+fi
 
 GHE_CREATE_DATA_DIR=${GHE_CREATE_DATA_DIR:-yes}
 

From e666ed14a5bd9236f4ca5f35f9bbb7b805261881 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <sergio.rubio@github.com>
Date: Mon, 16 May 2016 19:45:52 +0200
Subject: [PATCH 255/288] Log git-hooks restores for cluster

Minor, cosmetic issue but we should also log git-hooks restores for clusters.

/cc @github/backup-utils
---
 bin/ghe-restore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 45416956b..b34ba977c 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -240,6 +240,8 @@ ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT
 if $cluster; then
   echo "Restoring storage data ..."
   ghe-restore-alambic-cluster "$GHE_HOSTNAME" 1>&3
+  
+  echo "Restoring custom Git hooks ..."
   ghe-restore-git-hooks-cluster "$GHE_HOSTNAME" 1>&3
 elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
   echo "Restoring asset attachments ..."

From 106b57a3c08a7d1cad36154216f6c6ac06997889 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 17 May 2016 10:36:22 +1000
Subject: [PATCH 256/288] Tweak wording

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e8df1ceb6..6893d75b9 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,8 @@ patterns of the GitHub appliance. We recommend allocating at least 5x the amount
 of storage allocated to the primary GitHub appliance for historical snapshots
 and growth over time.
 
-As Repository, Search, and Pages data is stored efficiently via hard links,
-backup snapshots must be written to a filesystem which supports hard links.
+The backup utilities use [hard links][12] to store data efficiently, so the backup
+snapshots must be written to a filesystem with support for hard links.
 
 ##### GitHub Enterprise version requirements
 
@@ -281,3 +281,4 @@ site setup or recovery, please contact our [Enterprise support team][7] instead.
 [9]: https://enterprise.github.com/help/articles/restoring-enterprise-data
 [10]: https://help.github.com/enterprise/2.0/admin-guide/migrating-to-a-different-platform-or-from-github-enterprise-11-10-34x/
 [11]: https://help.github.com/enterprise/2.0/admin-guide/
+[12]: https://en.wikipedia.org/wiki/Hard_link

From 126097bdbab6b61dd9f8e5307d48cc29b7b456b4 Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 17 May 2016 15:13:23 +1000
Subject: [PATCH 257/288] Travis refactor with osx

---
 .travis.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d7d1d4ca2..adc20bd4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,13 @@
 ---
-script:
-  - debuild -uc -us
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y devscripts
+matrix:
+  include:
+    - os: osx
+      before_install:
+        - brew update
+        - brew install gnu-tar
+      script: make test
+    - os: linux
+      addons:
+        apt:
+          packages: devscripts
+      script: debuild -uc -us

From 271f59780fec0e2cdd5753455152a95805c6768d Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Mon, 16 May 2016 17:23:11 +1000
Subject: [PATCH 258/288] Support for systems lacking readlink -m

---
 share/github-backup-utils/ghe-backup-config | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 98c275aef..d7cfc05ce 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -74,9 +74,12 @@ if [ -z "$GHE_HOSTNAME" ]; then
     exit 2
 fi
 
-# Canonicalize the data directory path, basing any relative paths on the
-# backup-utils root.
-GHE_DATA_DIR="$( cd "$GHE_BACKUP_ROOT" && readlink -m "$GHE_DATA_DIR" )"
+# Convert the data directory path to an absolute path, basing any relative
+# paths on the backup-utils root, and using readlink, if available, to
+# canonicalize the path.
+if [ ${GHE_DATA_DIR:0:1} != "/" ]; then
+  GHE_DATA_DIR="$( cd "$GHE_BACKUP_ROOT" && readlink -m "$GHE_DATA_DIR" 2> /dev/null || echo "$GHE_BACKUP_ROOT/$GHE_DATA_DIR" )"
+fi
 
 GHE_CREATE_DATA_DIR=${GHE_CREATE_DATA_DIR:-yes}
 

From bbc5662da0b2ca17ca0ed90076228056877104ea Mon Sep 17 00:00:00 2001
From: Steven Honson <snh@github.com>
Date: Tue, 17 May 2016 15:33:54 +1000
Subject: [PATCH 259/288] Tweak fsck mktemp for osx

---
 share/github-backup-utils/ghe-backup-fsck | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-backup-fsck b/share/github-backup-utils/ghe-backup-fsck
index cc4c67567..19fd68e55 100755
--- a/share/github-backup-utils/ghe-backup-fsck
+++ b/share/github-backup-utils/ghe-backup-fsck
@@ -18,7 +18,7 @@ fi
 sdir=$1
 repos=0
 errors=0
-log=$(mktemp)
+log=$(mktemp -t ghe-backup-fsck-XXXXXX)
 t_start=$(date +%s)
 if git fsck -h | grep -q '\-\-dangling'; then
   git_cmd='git fsck --no-dangling'

From 47d6ab3d48b205887d5fc63a7eec9d2b8210e506 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 23 May 2016 18:20:57 +0200
Subject: [PATCH 260/288] Added ghe_verbose helper

Should be used when logging things that will be printed
using `ghe-restore` or `ghe-backup` `--verbose` mode.
---
 share/github-backup-utils/ghe-backup-config | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index d7cfc05ce..109ec1dd3 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -271,3 +271,11 @@ ghe_cluster_online_nodes () {
     role=$1
     echo "ghe-config --get-regexp cluster.*.$role | egrep 'true$' | awk '{ print \$1; }' | awk 'BEGIN { FS=\".\" }; { print \$2 };' | xargs -I{} -n1 bash -c 'if [ \"\$(ghe-config cluster.\$hostname.offline)\" != true ]; then ghe-config cluster.{}.hostname; fi'" | ghe-ssh "$GHE_HOSTNAME" /bin/bash
 }
+
+# Usage: ghe_verbose <message>
+# Log if verbose mode is enabled (GHE_VERBOSE or `-v`).
+ghe_verbose() {
+  if [ -n "$GHE_VERBOSE" ]; then
+    echo "$@" 1>&3
+  fi
+}

From 89a73eec4c81e5f08ec22695b5a421401815b3ec Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 23 May 2016 18:23:30 +0200
Subject: [PATCH 261/288] A faster way to restore storage blobs (clusters)

Storage routes for the storage blobs being restored
(LFS, release assets, images, etc...) are calculated remotely
all at once so we only need to rsync once per storage server available.

This needs some server side support from GitHub Enterprise 2.6.3 (unreleased).

The change is backwards compatible and only affects cluster restores.
`backup-utils` will use the old restore script when restoring to older
GitHub Enterprise versions.
---
 bin/ghe-restore                               |  10 +-
 .../ghe-restore-alambic-cluster-ng            | 123 ++++++++++++++++++
 2 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 share/github-backup-utils/ghe-restore-alambic-cluster-ng

diff --git a/bin/ghe-restore b/bin/ghe-restore
index b34ba977c..5dcac04d7 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -239,8 +239,14 @@ ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-authorized-keys' < "$GHE_RESTORE_SNAPSHOT
 
 if $cluster; then
   echo "Restoring storage data ..."
-  ghe-restore-alambic-cluster "$GHE_HOSTNAME" 1>&3
-  
+  if ghe-ssh "$GHE_HOSTNAME" test -f /data/github/current/script/storage-cluster-restore-routes; then
+    ghe_verbose "* Using ghe-restore-alambic-cluster-ng to restore"
+    # This restore script is faster but only available in
+    # GHE >= 2.6.3
+    ghe-restore-alambic-cluster-ng "$GHE_HOSTNAME" 1>&3
+  else
+    ghe-restore-alambic-cluster "$GHE_HOSTNAME" 1>&3
+  fi
   echo "Restoring custom Git hooks ..."
   ghe-restore-git-hooks-cluster "$GHE_HOSTNAME" 1>&3
 elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster-ng b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
new file mode 100644
index 000000000..d640b07f4
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
@@ -0,0 +1,123 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-alambic-cluster-ng <host>
+#/
+#/ Restore storage objects from an rsync snapshot to a GitHub Cluster.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when restoring into a cluster.
+set -e
+
+# Bring in the backup configuration
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Find the objets to restore
+storage_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/ && find storage -mindepth 4 -maxdepth 4 -type f -printf '%p %s\n' | cut -d / -f2-)
+
+# No need to restore anything, early exit
+if [ -z "$storage_paths" ]; then
+  echo "Warning: Storage backup missing. Skipping ..."
+  exit 0
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+# Generate SSH config for forwarding
+config=""
+hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+for hostname in $hostnames; do
+  config="$config
+Host $hostname
+  ServerAliveInterval 60
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p"
+done
+
+config_file=$(mktemp -t cluster-backup-restore-XXXXXX)
+echo "$config" > "$config_file"
+
+# Stores a list of "oid size" tuples.
+tmp_list=$(mktemp -t cluster-backup-restore-XXXXXX)
+to_restore=$(mktemp -t cluster-backup-restore-XXXXXX)
+
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+tempdir=$(mktemp -d)
+
+cleanup() {
+  rm -rf $tempdir $config_file $tmp_list $to_restore
+  true
+}
+
+trap 'cleanup' EXIT
+
+# Find the routes (servers) for each storage object available locally
+# Sends a list of "<oid> <size>" tuples with the following format:
+#
+# # OID bytes
+# b8a48b6b122b4ef8175348d1d6fbd846d3b3ccc8fd7552b79f91125c4958e43b 5592001
+# b851fd1f147c644a9de778f19090ea785b415c69e2a2fba35a65144fa2753ab9 7340032
+# b65f657194ca6202c17b5062e4afc11843fc892a3f2febef8ac10971db7689a8 5591634
+# b63c30f6f885e59282c2aa22cfca846516b5e72621c10a58140fb04d133e2c17 5592492
+# ...
+OLDIFS=$IFS; IFS=$'\n'
+for path in $storage_paths; do
+  oid=$(echo $path | cut -d ' ' -f 1 | awk -F/ '{print $(NF)}')
+  size=$(echo $path | cut -d ' ' -f 2)
+  echo $oid $size
+done > $tmp_list
+IFS=$OLDIFS
+
+ghe_verbose "* Sending the object list to the server..."
+
+# The server receives the list of objects and returns the list servers where the objects will be sent.
+# The format of the list returned by the server:
+#
+# # OID SERVER1 SERVER2 SERVER2
+# b8a48b6b122b4ef8175348d1d6fbd846d3b3ccc8fd7552b79f91125c4958e43b server1 server2 server3 
+# bc4cdd292e6b5387df2a42a907fcd5f3b6804a5d5ab427184faea5ef118d635e server1 server2 server3
+cat $tmp_list | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-restore-routes \
+ | while read obj; do
+  ghe_verbose "Received route: $obj"
+  oid=$(echo $obj | cut -d ' ' -f1)
+  oid_c1=$(echo $oid | cut -c1)
+  oid_c2=$(echo $oid | cut -c1-2)
+  oid_c3=$(echo $oid | cut -c3-4)
+  for server in $(echo $obj | cut -d ' ' -f2-); do
+    ghe_verbose "Adding $oid_c1/$oid_c2/$oid_c3/$oid to $tempdir/$server.rsync"
+    echo "$oid_c1/$oid_c2/$oid_c3/$oid" >> $tempdir/$server.rsync
+  done
+  echo "$obj" >> $to_restore
+done
+
+# rsync all the objects to the storage server where they belong.
+# One rsync invocation per server available.
+for route in $tempdir/*.rsync; do
+  ghe_verbose "* rsync data to $(basename $route .rsync) ..."
+  ghe-rsync -arHR --delete \
+    -e "ssh -q $opts -p $port -F $config_file -l $user" \
+    --rsync-path="sudo -u git rsync" \
+    --files-from=$route \
+    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/storage/./" \
+    "$(basename $route .rsync):$GHE_REMOTE_DATA_USER_DIR/storage/"
+done
+
+ghe_verbose "* Update storage database after the restore ..."
+cat $to_restore | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-restore-finalize

From f2ed18b987db5826873d2fd0aeeaebae9d10eb49 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 25 May 2016 16:27:13 +0200
Subject: [PATCH 262/288] Fix the way we source ghe-backup-config

Use the new way introduced by @snh in https://github.com/github/backup-utils/pull/199
---
 share/github-backup-utils/ghe-restore-alambic-cluster-ng | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster-ng b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
index d640b07f4..7d0464049 100644
--- a/share/github-backup-utils/ghe-restore-alambic-cluster-ng
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
@@ -8,8 +8,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage

From 7c54270aaa216229820b688cd98db401889c5824 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 25 May 2016 19:26:12 +0200
Subject: [PATCH 263/288] Make ghe-restore-alambic-cluster-ng executable

---
 share/github-backup-utils/ghe-restore-alambic-cluster-ng | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 share/github-backup-utils/ghe-restore-alambic-cluster-ng

diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster-ng b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
old mode 100644
new mode 100755

From b2ec9b7442bc91307efecc3dfa95c851b32435c9 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 25 May 2016 19:28:44 +0200
Subject: [PATCH 264/288] Fix the way we source ghe-backup-config

My last PR [1] missed these two.

[1]: https://github.com/github/backup-utils/pull/214
---
 share/github-backup-utils/ghe-backup-git-hooks-cluster  | 3 +--
 share/github-backup-utils/ghe-restore-git-hooks-cluster | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
index 33997bbdf..f8a657a9b 100755
--- a/share/github-backup-utils/ghe-backup-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Split host:port into parts
 port=$(ssh_port_part "$GHE_HOSTNAME")
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index b010a24f5..ac424a33f 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage

From 1e3a599cc8d88530bc057cba1ea1236136117765 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 25 May 2016 21:49:50 +0200
Subject: [PATCH 265/288] storage restores: remove some debugging messages

Mostly to be consistent, we don't write that kind of info to stdout
in other scripts.
---
 share/github-backup-utils/ghe-restore-alambic-cluster | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index 87d196189..775c281f5 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -69,15 +69,11 @@ mkfifo ssh_routes_in
 mkfifo ssh_routes_out
 mkfifo ssh_finalize_out
 
-echo "Setting up storage processes"
-
 ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-routes - < ssh_routes_out > ssh_routes_in &
 ssh_routes_pid=$!
 ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-import-finalize - < ssh_finalize_out &
 ssh_finalize_pid=$!
 
-echo "Set up storage processes"
-
 exec 4> ssh_routes_out
 exec 5> ssh_finalize_out
 

From e25b648898e721260a41d89a8eea982135e5e35e Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 26 May 2016 11:10:57 +0200
Subject: [PATCH 266/288] Quiet audit-log restores if there are not indices

Harmless but you'll see something like:

```
Restoring GitHub Pages into DPages...
Restoring SSH authorized keys ...
Restoring storage data ...
Restoring custom Git hooks ...
Restoring ElasticSearch Audit logs
ls: cannot access /home/rubiojr/backup-utils/data/26-snap/20160509T101107/audit-log/*.gz: No such file or directory
Configuring cluster ...
Completed restore of 10.0.1.172:122 from snapshot 20160509T101107
```

If there's nothing to restore.
---
 share/github-backup-utils/ghe-restore-es-audit-log | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
index f0fded87c..ada3c0e13 100755
--- a/share/github-backup-utils/ghe-restore-es-audit-log
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -19,7 +19,7 @@ ghe_remote_version_required "$GHE_HOSTNAME"
 
 last_index=$(ghe-ssh "$GHE_HOSTNAME" 'curl -s "localhost:9201/_cat/indices/audit_log*"' | cut -d ' ' -f 3 | sort | tail -1)
 
-indices=$(ls -1 $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/*.gz | xargs -I{} -n1 basename {} .gz)
+indices=$(ls -1 $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/*.gz 2>/dev/null | xargs -I{} -n1 basename {} .gz)
 
 for index in $indices; do
   if [ -z "$last_index" ] || ! [ $index \< $last_index ]; then

From d209ca1fec0bf15519e3f569f68d8108a29ce7ed Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Mon, 14 Mar 2016 18:36:13 +0100
Subject: [PATCH 267/288] Cluster: faster gist restores

Routes for the gist repositories being restored are calculated remotely
so we only need to rsync once per storage server available.

This needs some server side support from GitHub Enterprise 2.6.3 (unreleased).

The change is backwards compatible and only affects cluster restores.
backup-utils will use the old/slower script when restoring to older
GitHub Enterprise versions.
---
 bin/ghe-restore                               |  7 +-
 .../ghe-restore-repositories-gist-ng          | 93 +++++++++++++++++++
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100755 share/github-backup-utils/ghe-restore-repositories-gist-ng

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 5dcac04d7..e8647beeb 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -216,7 +216,12 @@ if $cluster; then
   ghe-restore-repositories-dgit "$GHE_HOSTNAME" 1>&3
 
   echo "Restoring Gists into cluster ..."
-  ghe-restore-repositories-gist "$GHE_HOSTNAME" 1>&3
+  if ghe-ssh "$GHE_HOSTNAME" test -f /data/github/current/script/gist-cluster-restore-routes; then
+    ghe_verbose "* Using ghe-restore-repositories-gist-ng to restore"
+    ghe-restore-repositories-gist-ng "$GHE_HOSTNAME" 1>&3
+  else
+    ghe-restore-repositories-gist "$GHE_HOSTNAME" 1>&3
+  fi
 else
   # Remove temporary 2.2 storage migration directory if it exists
   echo "if [ -d /data/user/repositories-nw-backup ]; then sudo rm -rf /data/user/repositories-nw-backup; fi" |
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist-ng b/share/github-backup-utils/ghe-restore-repositories-gist-ng
new file mode 100755
index 000000000..1a1a5f356
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-repositories-gist-ng
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-repositories-gist-ng <host>
+#/ Restore repositories fron an rsync snapshot of all Git repository data to a GitHub cluster.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when restoring into a cluster.
+set -e
+
+# Bring in the backup configuration
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Find the gists to restore
+gist_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/  && find repositories -mindepth 6 -maxdepth 7 -name \*.git | grep gist | cut -d / -f2-)
+
+# No need to restore anything, early exit
+if [ -z "$gist_paths" ]; then
+  echo "Warning: Gist backup missing. Skipping ..."
+  exit 0
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# Generate SSH config for forwarding
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+tempdir=$(mktemp -d)
+ssh_config_file=$tempdir/ssh_config
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+tmp_list=$tempdir/tmp_list
+to_restore=$tempdir/to_restore
+
+hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+for hostname in $hostnames; do
+  echo "
+Host $hostname
+  ServerAliveInterval 60
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p" >> $ssh_config_file
+done
+
+cleanup() {
+  rm -rf $tempdir
+}
+trap cleanup EXIT
+
+# Find the routes (servers) for each gist available locally
+OLDIFS=$IFS; IFS=$'\n'
+for path in $gist_paths; do
+   echo $path
+done > $tmp_list
+IFS=$OLDIFS
+
+cat $tmp_list | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/gist-cluster-restore-routes \
+ | while read route; do
+  servers=$(echo $route | cut -d ' ' -f2-)
+  for server in $servers; do
+    gist=$(echo $route | cut -d ' ' -f1)
+    ghe_verbose "Adding $gist to $tempdir/$server.rsync"
+    echo "$gist" >> $tempdir/$server.rsync
+ done
+
+ gist_id=$(basename $(echo $route | cut -d ' ' -f 1) .git)
+ ghe_verbose "Route: $gist_id /data/repositories/$gist $servers"
+ echo "$gist_id /data/repositories/$gist $servers" >> $to_restore
+done
+
+# rsync all the gist repositories
+for route in $tempdir/*.rsync; do
+  ghe-rsync -arHR --delete \
+    -e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
+    --rsync-path="sudo -u git rsync" \
+    --files-from=$route \
+    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/./" \
+    "$(basename $route .rsync):$GHE_REMOTE_DATA_USER_DIR/repositories/"
+done
+
+cat $to_restore | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/gist-cluster-restore-finalize

From b110c66f6394a547064c2bde1e7b4b803b2841fe Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 31 May 2016 17:29:21 +0200
Subject: [PATCH 268/288] ghe-rsync: -r is not required when using -a

---
 share/github-backup-utils/ghe-restore-repositories-gist-ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-restore-repositories-gist-ng b/share/github-backup-utils/ghe-restore-repositories-gist-ng
index 1a1a5f356..c9a82c603 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist-ng
+++ b/share/github-backup-utils/ghe-restore-repositories-gist-ng
@@ -82,7 +82,7 @@ done
 
 # rsync all the gist repositories
 for route in $tempdir/*.rsync; do
-  ghe-rsync -arHR --delete \
+  ghe-rsync -aHR --delete \
     -e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
     --files-from=$route \

From ff7d0a0c031e7cb804e5cd7f084731447f85e2cc Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 31 May 2016 20:14:05 +0200
Subject: [PATCH 269/288] Revert "ghe-rsync: -r is not required when using -a"

Actually required when using `--files-from`

This reverts commit b110c66f6394a547064c2bde1e7b4b803b2841fe.
---
 share/github-backup-utils/ghe-restore-repositories-gist-ng | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/ghe-restore-repositories-gist-ng b/share/github-backup-utils/ghe-restore-repositories-gist-ng
index c9a82c603..1a1a5f356 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist-ng
+++ b/share/github-backup-utils/ghe-restore-repositories-gist-ng
@@ -82,7 +82,7 @@ done
 
 # rsync all the gist repositories
 for route in $tempdir/*.rsync; do
-  ghe-rsync -aHR --delete \
+  ghe-rsync -arHR --delete \
     -e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
     --files-from=$route \

From a6ea49143bdb7ad994f0c44ef591b110914b7bf7 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 31 May 2016 20:57:34 +0200
Subject: [PATCH 270/288] Bump version: 2.6.1

---
 debian/changelog                  | 8 ++++++++
 share/github-backup-utils/version | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cc0975c14..06b366a6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+github-backup-utils (2.6.1) UNRELEASED; urgency=medium
+
+  * Cluster: faster gist restores #220
+  * Cluster: faster storage restores #212
+  * Cluster: fix git-hooks restores #209
+
+ -- Sergio Rubio <rubiojr@github.com>  Tue, 31 May 2016 20:54:11 +0200
+
 github-backup-utils (2.6.0) UNRELEASED; urgency=medium
 
   * Adds support for GitHub Enterprise 2.6
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index e70b4523a..6a6a3d8e3 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.6.0
+2.6.1

From 15c77613c51229ae5c866c76e907194a5fd6db22 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 31 May 2016 21:02:18 +0200
Subject: [PATCH 271/288] Fix git-hooks restore PR id

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 06b366a6b..7f9aace82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ github-backup-utils (2.6.1) UNRELEASED; urgency=medium
 
   * Cluster: faster gist restores #220
   * Cluster: faster storage restores #212
-  * Cluster: fix git-hooks restores #209
+  * Cluster: fix git-hooks restores #204
 
  -- Sergio Rubio <rubiojr@github.com>  Tue, 31 May 2016 20:54:11 +0200
 

From 0ce07f6dc8590da2a7d4933c665851c9efa2adee Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 25 May 2016 16:25:39 +0200
Subject: [PATCH 272/288] Benchmark the restore process

Simple benchmarking that logs the time it takes to restore data. Looks something like:

$ cat data/26-snap/current/benchmarks/benchmark.1464253606.log
ghe-import-mysql took: 7s
ghe-import-redis took: 43s
ghe-restore-repositories-dgit took: 11s
ghe-restore-alambic-cluster-ng took: 6s
ghe-restore-git-hooks-cluster took: 2s
ghe-restore-es-audit-log took: 0s

The log is timestamped and stored in the benchmarks directory,
along with the data that was restored.
---
 bin/ghe-restore                               |  4 ++
 share/github-backup-utils/bm.sh               | 51 +++++++++++++++++++
 share/github-backup-utils/ghe-backup-config   |  2 +
 .../ghe-backup-git-hooks-cluster              |  3 +-
 .../ghe-restore-alambic-cluster               |  4 ++
 .../ghe-restore-alambic-cluster-ng            |  9 ++--
 .../ghe-restore-es-audit-log                  |  4 ++
 .../github-backup-utils/ghe-restore-es-rsync  |  4 ++
 .../ghe-restore-es-tarball                    |  4 ++
 .../ghe-restore-git-hooks-cluster             |  7 ++-
 .../ghe-restore-pages-dpages                  |  4 ++
 .../ghe-restore-pages-rsync                   |  4 ++
 .../ghe-restore-pages-tarball                 |  4 ++
 .../ghe-restore-repositories-dgit             |  4 ++
 .../ghe-restore-repositories-gist             |  4 ++
 .../ghe-restore-repositories-rsync            |  4 ++
 .../ghe-restore-repositories-tarball          |  4 ++
 .../github-backup-utils/ghe-restore-settings  |  4 ++
 .../github-backup-utils/ghe-restore-userdata  |  4 ++
 test/test-ghe-restore.sh                      | 11 ++++
 20 files changed, 132 insertions(+), 7 deletions(-)
 create mode 100644 share/github-backup-utils/bm.sh
 mode change 100644 => 100755 share/github-backup-utils/ghe-restore-alambic-cluster-ng

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 5dcac04d7..8535478d7 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -206,10 +206,14 @@ if ! $cluster; then
 fi
 
 echo "Restoring MySQL database ..."
+bm_start "ghe-import-mysql"
 gzip -dc "$GHE_RESTORE_SNAPSHOT_PATH/mysql.sql.gz" | ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-mysql'
+bm_end "ghe-import-mysql"
 
 echo "Restoring Redis database ..."
+bm_start "ghe-import-redis"
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-redis' < "$GHE_RESTORE_SNAPSHOT_PATH/redis.rdb" 1>&3
+bm_end "ghe-import-redis"
 
 if $cluster; then
   echo "Restoring Git repositories into cluster ..."
diff --git a/share/github-backup-utils/bm.sh b/share/github-backup-utils/bm.sh
new file mode 100644
index 000000000..56421a569
--- /dev/null
+++ b/share/github-backup-utils/bm.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+# bm.sh: benchmarking Bash code blocks
+#
+# Example:
+#   bm_start "wget request"
+#   wget --quiet https://www.google.com
+#   bm_end "wget request"
+#
+# Sample output:
+#   $ bash test.sh
+#   wget request took 2s
+
+bm_desc_to_varname(){
+ echo "__bm$(echo $@ | tr -cd '[[:alnum:]]')"
+}
+
+bm_start()
+{
+  eval "$(bm_desc_to_varname $@)_start=$(date +%s)"
+
+  bm_file_path > /dev/null
+}
+
+bm_file_path() {
+  if [ -n "$BM_FILE_PATH" ]; then
+    echo $BM_FILE_PATH
+    return
+  fi
+
+  local logfile="benchmark.${BM_TIMESTAMP:-$(date +"%Y%m%dT%H%M%S")}.log"
+  if [ -n "$GHE_RESTORE_SNAPSHOT_PATH" ]; then
+    export BM_FILE_PATH=$GHE_RESTORE_SNAPSHOT_PATH/benchmarks/$logfile
+  else
+    export BM_FILE_PATH=$GHE_SNAPSHOT_DIR/benchmarks/$logfile
+  fi
+
+  mkdir -p $(dirname $BM_FILE_PATH)
+  echo $BM_FILE_PATH
+}
+
+bm_end() {
+  if [ -z "$BM_FILE_PATH" ]; then
+    echo "Call bm_start first" >&2
+    exit 1
+  fi
+
+  local tend=$(date +%s)
+  local tstart=$(eval "echo \$$(bm_desc_to_varname $@)_start")
+
+  echo "$1 took $(($tend - $tstart))s" >> $BM_FILE_PATH
+}
diff --git a/share/github-backup-utils/ghe-backup-config b/share/github-backup-utils/ghe-backup-config
index 109ec1dd3..277558a06 100755
--- a/share/github-backup-utils/ghe-backup-config
+++ b/share/github-backup-utils/ghe-backup-config
@@ -23,6 +23,8 @@ BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/share/github-backup-utils/version)"
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 
+. $GHE_BACKUP_ROOT/share/github-backup-utils/bm.sh
+
 # Parse out -v (verbose) argument
 if [ "$1" = "-v" ]; then
     GHE_VERBOSE=true
diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
index 33997bbdf..f8a657a9b 100755
--- a/share/github-backup-utils/ghe-backup-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -7,8 +7,7 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. share/github-backup-utils/ghe-backup-config
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
 # Split host:port into parts
 port=$(ssh_port_part "$GHE_HOSTNAME")
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster b/share/github-backup-utils/ghe-restore-alambic-cluster
index 87d196189..6190ab056 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster
@@ -12,6 +12,8 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -117,3 +119,5 @@ cat ssh_routes_in > /dev/null &
 
 wait $ssh_routes_pid > /dev/null 2>&1 || true
 wait $ssh_finalize_pid > /dev/null 2>&1 || true
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster-ng b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
old mode 100644
new mode 100755
index d640b07f4..9c1c87df4
--- a/share/github-backup-utils/ghe-restore-alambic-cluster-ng
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
@@ -8,12 +8,13 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. 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)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -91,7 +92,7 @@ ghe_verbose "* Sending the object list to the server..."
 # The format of the list returned by the server:
 #
 # # OID SERVER1 SERVER2 SERVER2
-# b8a48b6b122b4ef8175348d1d6fbd846d3b3ccc8fd7552b79f91125c4958e43b server1 server2 server3 
+# b8a48b6b122b4ef8175348d1d6fbd846d3b3ccc8fd7552b79f91125c4958e43b server1 server2 server3
 # bc4cdd292e6b5387df2a42a907fcd5f3b6804a5d5ab427184faea5ef118d635e server1 server2 server3
 cat $tmp_list | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-restore-routes \
  | while read obj; do
@@ -121,3 +122,5 @@ done
 
 ghe_verbose "* Update storage database after the restore ..."
 cat $to_restore | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/storage-cluster-restore-finalize
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-es-audit-log b/share/github-backup-utils/ghe-restore-es-audit-log
index f0fded87c..6f02002c0 100755
--- a/share/github-backup-utils/ghe-restore-es-audit-log
+++ b/share/github-backup-utils/ghe-restore-es-audit-log
@@ -12,6 +12,8 @@ set -e
 # Show usage and bail with no arguments
 [ $# -lt 1 ] && print_usage
 
+bm_start "$(basename $0)"
+
 GHE_HOSTNAME="$1"
 
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
@@ -27,3 +29,5 @@ for index in $indices; do
     gzip -dc $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/audit-log/$index.gz | ghe-ssh "$GHE_HOSTNAME" "/usr/local/share/enterprise/ghe-es-load-json 'http://localhost:9201/$index'"
   fi
 done
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-es-rsync b/share/github-backup-utils/ghe-restore-es-rsync
index bfd4006f0..b33722872 100755
--- a/share/github-backup-utils/ghe-restore-es-rsync
+++ b/share/github-backup-utils/ghe-restore-es-rsync
@@ -12,6 +12,8 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -63,3 +65,5 @@ else
     $TAR -cf - --owner=root --group=root elasticsearch |
     ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-es-indices' 1>&3
 fi
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-es-tarball b/share/github-backup-utils/ghe-restore-es-tarball
index fc50f6ac7..4afc69907 100755
--- a/share/github-backup-utils/ghe-restore-es-tarball
+++ b/share/github-backup-utils/ghe-restore-es-tarball
@@ -15,6 +15,8 @@ GHE_HOSTNAME="$1"
 # Show usage and bail with no <host>
 [ -z "$GHE_HOSTNAME" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # The snapshot to restore should be set by the ghe-restore command but this lets
 # us run this script directly.
 : ${GHE_RESTORE_SNAPSHOT:=current}
@@ -22,3 +24,5 @@ GHE_HOSTNAME="$1"
 # Restore ElasticSearch indices from tarball snapshot.
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-es-indices' \
     < "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/elasticsearch.tar" 1>&3
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index b010a24f5..50cffed8f 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -7,12 +7,13 @@
 set -e
 
 # Bring in the backup configuration
-cd $(dirname "$0")/../..
-. 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)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -75,3 +76,5 @@ if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" ]; then
     fi
   done
 fi
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-pages-dpages b/share/github-backup-utils/ghe-restore-pages-dpages
index 419b61627..581c7f570 100755
--- a/share/github-backup-utils/ghe-restore-pages-dpages
+++ b/share/github-backup-utils/ghe-restore-pages-dpages
@@ -12,6 +12,8 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -122,3 +124,5 @@ cat ssh_finalize_in > /dev/null &
 
 wait $ssh_routes_pid > /dev/null 2>&1 || true
 wait $ssh_finalize_pid > /dev/null 2>&1 || true
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-pages-rsync b/share/github-backup-utils/ghe-restore-pages-rsync
index d68e8bcb4..2c1c3e171 100755
--- a/share/github-backup-utils/ghe-restore-pages-rsync
+++ b/share/github-backup-utils/ghe-restore-pages-rsync
@@ -12,5 +12,9 @@ set -e
 # 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)"
diff --git a/share/github-backup-utils/ghe-restore-pages-tarball b/share/github-backup-utils/ghe-restore-pages-tarball
index 2f8a9766a..35b16bd5d 100755
--- a/share/github-backup-utils/ghe-restore-pages-tarball
+++ b/share/github-backup-utils/ghe-restore-pages-tarball
@@ -15,6 +15,8 @@ GHE_HOSTNAME="$1"
 # Show usage and bail with no <host>
 [ -z "$GHE_HOSTNAME" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # The snapshot to restore should be set by the ghe-restore command but this lets
 # us run this script directly.
 : ${GHE_RESTORE_SNAPSHOT:=current}
@@ -22,3 +24,5 @@ GHE_HOSTNAME="$1"
 # Restore Pages data from tarball snapshot.
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-pages' \
     < "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/pages.tar" 1>&3
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit b/share/github-backup-utils/ghe-restore-repositories-dgit
index 26cb30b22..c73d44cb5 100755
--- a/share/github-backup-utils/ghe-restore-repositories-dgit
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit
@@ -12,6 +12,8 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -141,3 +143,5 @@ if [ -d $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info ]; then
 else
   ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -- rm -f /data/repositories/info/*
 fi
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-repositories-gist b/share/github-backup-utils/ghe-restore-repositories-gist
index 84d59a569..e8d6d26e7 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist
+++ b/share/github-backup-utils/ghe-restore-repositories-gist
@@ -12,6 +12,8 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -134,3 +136,5 @@ cat ssh_finalize_in > /dev/null &
 
 wait $ssh_routes_pid > /dev/null 2>&1 || true
 wait $ssh_finalize_pid > /dev/null 2>&1 || true
+
+bm_start "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-repositories-rsync b/share/github-backup-utils/ghe-restore-repositories-rsync
index 302184b9c..9dccda6c8 100755
--- a/share/github-backup-utils/ghe-restore-repositories-rsync
+++ b/share/github-backup-utils/ghe-restore-repositories-rsync
@@ -12,6 +12,8 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -40,3 +42,5 @@ ghe-rsync -avH --delete \
     --rsync-path="sudo -u git rsync" \
     "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/" \
     "$(ssh_host_part "$GHE_HOSTNAME"):$GHE_REMOTE_DATA_USER_DIR/repositories" 1>&3
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-repositories-tarball b/share/github-backup-utils/ghe-restore-repositories-tarball
index 78db05341..1d277dfad 100755
--- a/share/github-backup-utils/ghe-restore-repositories-tarball
+++ b/share/github-backup-utils/ghe-restore-repositories-tarball
@@ -9,6 +9,8 @@ set -e
 # Bring in the backup configuration
 . $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
+bm_start "$(basename $0)"
+
 # Grab the host arg
 GHE_HOSTNAME="$1"
 
@@ -22,3 +24,5 @@ GHE_HOSTNAME="$1"
 # Restore Git repository data from tarball snapshot.
 ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-repositories' \
     < "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories.tar" 1>&3
+
+bm_end "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-settings b/share/github-backup-utils/ghe-restore-settings
index d29d77b94..89aa934b4 100755
--- a/share/github-backup-utils/ghe-restore-settings
+++ b/share/github-backup-utils/ghe-restore-settings
@@ -9,6 +9,8 @@ set -e
 # Show usage and bail with no arguments
 [ -z "$*" ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab host arg
 GHE_HOSTNAME="$1"
 
@@ -61,3 +63,5 @@ if [ -f "$GHE_RESTORE_SNAPSHOT_PATH/saml-keys.tar" ]; then
     cat "$GHE_RESTORE_SNAPSHOT_PATH/saml-keys.tar" |
     ghe-ssh "$GHE_HOSTNAME" -- "sudo tar -C $GHE_REMOTE_DATA_USER_DIR/common/ -xf -"
 fi
+
+bm_start "$(basename $0)"
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index 6670f7aa5..a544b75c3 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -11,6 +11,8 @@ set -e
 # Show usage and bail with no arguments
 [ $# -lt 2 ] && print_usage
 
+bm_start "$(basename $0)"
+
 # Grab userdata directory name and host args
 dirname="$1"
 GHE_HOSTNAME="$2"
@@ -37,3 +39,5 @@ if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/$dirname" ]; then
       "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/$dirname/" \
       "$(ssh_host_part "$GHE_HOSTNAME"):$GHE_REMOTE_DATA_USER_DIR/$dirname" 1>&3
 fi
+
+bm_end "$(basename $0)"
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 3bda105b3..f91d515e2 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -136,6 +136,17 @@ begin_test "ghe-restore into configured vm"
 )
 end_test
 
+begin_test "ghe-restore logs the benchmark"
+(
+  set -e
+
+  export BM_TIMESTAMP=foo
+  export GHE_RESTORE_HOST=127.0.0.1
+  ghe-restore -v -f
+  [ $(grep took $GHE_DATA_DIR/current/benchmarks/benchmark.foo.log | wc -l) -gt 1 ]
+)
+end_test
+
 begin_test "ghe-restore aborts without user verification"
 (
     set -e

From a53115483e6fb59bf57911ba39e848d1e07486f6 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Thu, 9 Jun 2016 13:42:44 +0200
Subject: [PATCH 273/288] Verbose rsync when restoring gist repositories

The output is sent to fd#3, so only available when using the verbose flag (-v).

This is consistent with the other scripts using rsync and also helpful for
support/troubleshooting.
---
 share/github-backup-utils/ghe-restore-repositories-gist-ng | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/github-backup-utils/ghe-restore-repositories-gist-ng b/share/github-backup-utils/ghe-restore-repositories-gist-ng
index 1a1a5f356..05c6f0b64 100755
--- a/share/github-backup-utils/ghe-restore-repositories-gist-ng
+++ b/share/github-backup-utils/ghe-restore-repositories-gist-ng
@@ -82,12 +82,12 @@ done
 
 # rsync all the gist repositories
 for route in $tempdir/*.rsync; do
-  ghe-rsync -arHR --delete \
+  ghe-rsync -avrHR --delete \
     -e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
     --files-from=$route \
     "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/./" \
-    "$(basename $route .rsync):$GHE_REMOTE_DATA_USER_DIR/repositories/"
+    "$(basename $route .rsync):$GHE_REMOTE_DATA_USER_DIR/repositories/" 1>&3
 done
 
 cat $to_restore | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/gist-cluster-restore-finalize

From 0790ae1ac594410910cb7553c747312e816e4d22 Mon Sep 17 00:00:00 2001
From: Ke Zhu <kzhu@us.ibm.com>
Date: Mon, 13 Jun 2016 23:43:07 -0400
Subject: [PATCH 274/288] restore host keys for cluster environment as well

---
 bin/ghe-restore | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 0185c2d1e..c9110127f 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -287,6 +287,10 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
         ghe-ssh "$GHE_HOSTNAME" -- /bin/sh
 fi
 
+# restore host keys at last step before applying config changes
+echo "Restoring SSH host keys ..."
+ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+
 # When restoring to a host that has already been configured, kick off a
 # config run to perform data migrations.
 if $cluster; then
@@ -311,11 +315,6 @@ update_restore_status "complete"
 # Log restore complete message in /var/log/syslog on remote instance
 ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_RESTORE_SNAPSHOT}."
 
-if ! $cluster; then
-  echo "Restoring SSH host keys ..."
-  ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
-fi
-
 echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
 
 if ! $cluster; then

From 6a7e635515b838669a3eec904e6b676df6695793 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <sergio.rubio@github.com>
Date: Mon, 20 Jun 2016 19:43:23 +0200
Subject: [PATCH 275/288] Revert "restore host keys for cluster environment as
 well"

---
 bin/ghe-restore | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index c9110127f..0185c2d1e 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -287,10 +287,6 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
         ghe-ssh "$GHE_HOSTNAME" -- /bin/sh
 fi
 
-# restore host keys at last step before applying config changes
-echo "Restoring SSH host keys ..."
-ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
-
 # When restoring to a host that has already been configured, kick off a
 # config run to perform data migrations.
 if $cluster; then
@@ -315,6 +311,11 @@ update_restore_status "complete"
 # Log restore complete message in /var/log/syslog on remote instance
 ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_RESTORE_SNAPSHOT}."
 
+if ! $cluster; then
+  echo "Restoring SSH host keys ..."
+  ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+fi
+
 echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
 
 if ! $cluster; then

From cbc9bc6bda7b5fcb5922d819492caa36c8d92d05 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <sergio.rubio@github.com>
Date: Tue, 21 Jun 2016 00:57:39 +0200
Subject: [PATCH 276/288] Clusters: Restore Git over SSH host keys

Restores Git over SSH (babeld) keys and distribute them to all the nodes in the cluster.

Initially fixed by https://github.com/github/backup-utils/pull/228 and later reverted in https://github.com/github/backup-utils/pull/229, this new patch prevents the SSH host keys to be replaced, breaking `ghe-restore` in the process (new SSH connections after the host key restore will fail).

Fixes https://github.com/github/backup-utils/226
---
 bin/ghe-restore          |  7 +++++
 test/test-ghe-restore.sh | 58 ----------------------------------------
 2 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 0185c2d1e..07deb5684 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -314,6 +314,13 @@ ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_RESTORE_S
 if ! $cluster; then
   echo "Restoring SSH host keys ..."
   ghe-ssh "$GHE_HOSTNAME" -- 'ghe-import-ssh-host-keys' < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+else
+  # This will make sure that Git over SSH host keys (babeld) are
+  # copied to all the cluster nodes so babeld uses the same keys.
+  echo "Restoring Git over SSH host keys ..."
+  ghe-ssh "$GHE_HOSTNAME" -- "sudo tar -xpf - -C /data/user/common" < "$GHE_RESTORE_SNAPSHOT_PATH/ssh-host-keys.tar" 1>&3
+  ghe-ssh "$GHE_HOSTNAME" -- "sudo chown babeld:babeld /data/user/common/ssh_host_*" 1>&3
+  ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-cluster-config-update -s" 1>&3
 fi
 
 echo "Completed restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index f91d515e2..7a765526c 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -466,61 +466,3 @@ begin_test "ghe-restore with tarball strategy"
     echo "$output" | grep -q 'fake ghe-export-repositories data'
 )
 end_test
-
-begin_test "cluster: ghe-restore from v2.4.0 snapshot"
-(
-    set -e
-    rm -rf "$GHE_REMOTE_ROOT_DIR"
-    setup_remote_cluster || exit 0
-    setup_remote_metadata
-
-    # set restore host environ var
-    GHE_RESTORE_HOST=127.0.0.1
-    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"
-    touch "$GHE_REMOTE_DATA_DIR/github/current/public/system/maintenance.html"
-
-    echo "v2.4.0" > "$GHE_DATA_DIR/current/version"
-
-    # run ghe-restore and write output to file for asserting against
-    if ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
-        cat "$TRASHDIR/restore-out"
-        : ghe-restore should have exited non-zero
-        false
-    fi
-
-    # verify restore error message
-    grep -q "Error: Snapshot must be from" "$TRASHDIR/restore-out"
-)
-end_test
-
-begin_test "cluster: ghe-restore from v2.5.0 snapshot"
-(
-    set -e
-    rm -rf "$GHE_REMOTE_ROOT_DIR"
-    setup_remote_cluster || exit 0
-    setup_remote_metadata
-
-    # set restore host environ var
-    GHE_RESTORE_HOST=127.0.0.1
-    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" "$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"
-
-    # run ghe-restore and write output to file for asserting against
-    if ! ghe-restore -v -f > "$TRASHDIR/restore-out" 2>&1; then
-        cat "$TRASHDIR/restore-out"
-        : 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

From ec932a93483e0a06183aaca059c8a796c9adff3f Mon Sep 17 00:00:00 2001
From: Dirkjan Bussink <d.bussink@gmail.com>
Date: Tue, 21 Jun 2016 15:21:26 +0200
Subject: [PATCH 277/288] git-hooks backup/restore fixes

We now use a tarball based backup/restore approach, fixing
problems with permissions when backing up and restoring user provided environments.

From @snh:

If files or directories within a hook environment are lacking the user read and/or write bits, then a number of issues arise:

* The hook environment cannot be backed up by the backup utilities, and causes a backup failure, as the backup utilities needs the user read bit to access all files and directories as the git user.

* Older backup snapshots cannot be pruned, as the backup utilities needs the user write bit to remove all files and directories as the account that is running the backup utilities.

@dbussink, @willabides and @snh: thanks for the new implementation
and feedback.
---
 bin/ghe-backup                                |  6 +-
 bin/ghe-restore                               |  4 +-
 .../ghe-backup-git-hooks-cluster              | 48 ++++++++++-----
 share/github-backup-utils/ghe-backup-userdata | 23 +++++++-
 .../ghe-restore-alambic-cluster-ng            |  6 +-
 .../ghe-restore-git-hooks-cluster             | 24 +++++++-
 .../ghe-restore-git-hooks-extract             | 35 +++++++++++
 .../github-backup-utils/ghe-restore-userdata  |  2 +-
 test/bin/ghe-hook-env-update                  | 12 ++++
 test/test-ghe-backup.sh                       | 59 ++++++++++++++-----
 test/test-ghe-restore.sh                      | 44 ++++++++++----
 11 files changed, 208 insertions(+), 55 deletions(-)
 create mode 100755 share/github-backup-utils/ghe-restore-git-hooks-extract
 create mode 100755 test/bin/ghe-hook-env-update

diff --git a/bin/ghe-backup b/bin/ghe-backup
index 71751e738..bc94c45bb 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -190,8 +190,10 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
         failures="$failures hookshot"
 
         echo "Backing up custom Git hooks ..."
-        ghe-backup-userdata git-hooks ||
-        failures="$failures git-hooks"
+        ghe-backup-userdata git-hooks/environments/tarballs ||
+        failures="$failures git-hooks-environments"
+        ghe-backup-userdata git-hooks/repos ||
+        failures="$failures git-hooks-repos"
     fi
 fi
 
diff --git a/bin/ghe-restore b/bin/ghe-restore
index 07deb5684..7c4082ec3 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -269,7 +269,9 @@ elif [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
   ghe-restore-userdata hookshot "$GHE_HOSTNAME" 1>&3
 
   echo "Restoring custom Git hooks ..."
-  ghe-restore-userdata git-hooks "$GHE_HOSTNAME" 1>&3
+  ghe-restore-userdata git-hooks/environments/tarballs "$GHE_HOSTNAME" 1>&3
+  ghe-restore-userdata git-hooks/repos "$GHE_HOSTNAME" 1>&3
+  ghe-restore-git-hooks-extract "$GHE_HOSTNAME" 1>&3
 fi
 
 if $cluster; then
diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
index f8a657a9b..1cd0c243a 100755
--- a/share/github-backup-utils/ghe-backup-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -58,12 +58,6 @@ cleanup() {
 trap 'cleanup' EXIT
 trap 'exit $?' INT # ^C always terminate
 
-# If we have a previous increment, avoid transferring existing files via rsync's
-# --link-dest support. This also decreases physical space usage considerably.
-if [ -d "$backup_current" ]; then
-    link_dest="--link-dest=../../current/git-hooks"
-fi
-
 # Transfer Git hooks data from a GitHub instance to the current snapshot
 # directory, using a previous snapshot to avoid transferring files that have
 # already been transferred. A set of rsync filter rules are provided on stdin
@@ -72,16 +66,42 @@ rsync_git_hooks_data () {
     port=$(ssh_port_part "$1")
     host=$(ssh_host_part "$1")
 
-    shift
+    subpath=$2
+    shift 2
+
+    # If we have a previous increment and it is not empty, avoid transferring existing files via rsync's
+    # --link-dest support. This also decreases physical space usage considerably.
+    if [ -d "$backup_current/$subpath" ] && [ "$(ls -A $backup_current/$subpath)" ]; then
+
+      subdir="git-hooks/$subpath"
+      link_path=".."
+      while true; do
+        if [ $(dirname $subdir) = "." ]; then
+          break
+        fi
+
+        if [ $(dirname $subdir) = "/" ]; then
+          break
+        fi
+
+        link_path="../$link_path"
+        subdir=$(dirname $subdir)
+      done
+
+      local link_dest="--link-dest=../${link_path}/current/git-hooks/$subpath"
+    fi
+
+    # Ensure target directory exists, is needed with subdirectories
+    mkdir -p "$backup_dir/$subpath"
+
     ghe-rsync -a \
         -e "ssh -q $opts -p $port -F $config_file -l $user" $link_dest \
         --rsync-path='sudo -u git rsync' \
-        "$host:$GHE_REMOTE_DATA_USER_DIR/git-hooks/" \
-        "$backup_dir" 1>&3
+        "$host:$GHE_REMOTE_DATA_USER_DIR/git-hooks/$subpath/" \
+        "$backup_dir/$subpath" 1>&3
 }
 
-for hostname in $hostnames; do
-  ghe-ssh -F $config_file "$hostname:122" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/git-hooks' ]" || exit 0
-  # We can stop after the first successful sync since hooks are the same everywhere
-  rsync_git_hooks_data $hostname:122 && break
-done
+hostname=$(echo $hostnames | awk '{ print $1; }')
+ghe-ssh -F $config_file "$hostname:122" -- "sudo -u git [ -d '$GHE_REMOTE_DATA_USER_DIR/git-hooks' ]" || exit 0
+rsync_git_hooks_data $hostname:122 environments/tarballs
+rsync_git_hooks_data $hostname:122 repos
diff --git a/share/github-backup-utils/ghe-backup-userdata b/share/github-backup-utils/ghe-backup-userdata
index 95390dbae..5cb68f8eb 100755
--- a/share/github-backup-utils/ghe-backup-userdata
+++ b/share/github-backup-utils/ghe-backup-userdata
@@ -23,14 +23,33 @@ ghe_remote_version_required "$host"
 
 # Verify that the user data directory exists. Bail out if not, which may be due
 # to an older version of GHE or no data has been added to this directory yet.
-ghe-ssh "$host" -- "[ -d '$GHE_REMOTE_DATA_USER_DIR/$dirname' ]" || exit 0
+ghe-ssh "$host" -- "sudo -u git [ -d '$GHE_REMOTE_DATA_USER_DIR/$dirname' ]" || exit 0
 
 # If we have a previous increment and it is not empty, avoid transferring existing files via rsync's
 # --link-dest support. This also decreases physical space usage considerably.
 if [ -d "$GHE_DATA_DIR/current/$dirname" ] && [ "$(ls -A $GHE_DATA_DIR/current/$dirname)" ]; then
-    link_dest="--link-dest=../../current/$dirname"
+
+  subdir=$dirname
+  link_path=".."
+  while true; do
+    if [ $(dirname $subdir) = "." ]; then
+      break
+    fi
+
+    if [ $(dirname $subdir) = "/" ]; then
+      break
+    fi
+
+    link_path="../$link_path"
+    subdir=$(dirname $subdir)
+  done
+
+  link_dest="--link-dest=../${link_path}/current/$dirname"
 fi
 
+# Ensure target directory exists, is needed with subdirectories
+mkdir -p "$GHE_SNAPSHOT_DIR/$dirname"
+
 # Transfer all data from the user data directory using rsync.
 ghe-rsync -avz \
     -e "ghe-ssh -p $(ssh_port_part "$host")" \
diff --git a/share/github-backup-utils/ghe-restore-alambic-cluster-ng b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
index 9c1c87df4..675167cb9 100755
--- a/share/github-backup-utils/ghe-restore-alambic-cluster-ng
+++ b/share/github-backup-utils/ghe-restore-alambic-cluster-ng
@@ -23,7 +23,7 @@ GHE_HOSTNAME="$1"
 : ${GHE_RESTORE_SNAPSHOT:=current}
 
 # Find the objets to restore
-storage_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/ && find storage -mindepth 4 -maxdepth 4 -type f -printf '%p %s\n' | cut -d / -f2-)
+storage_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/ && find storage -mindepth 4 -maxdepth 4 -type f -exec wc -c {} \;)
 
 # No need to restore anything, early exit
 if [ -z "$storage_paths" ]; then
@@ -80,8 +80,8 @@ trap 'cleanup' EXIT
 # ...
 OLDIFS=$IFS; IFS=$'\n'
 for path in $storage_paths; do
-  oid=$(echo $path | cut -d ' ' -f 1 | awk -F/ '{print $(NF)}')
-  size=$(echo $path | cut -d ' ' -f 2)
+  oid=$(echo $path | awk -F/ '{print $(NF)}')
+  size=$(echo $path | awk '{print $1}')
   echo $oid $size
 done > $tmp_list
 IFS=$OLDIFS
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index 50cffed8f..6dd1a7ee8 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -58,13 +58,31 @@ cleanup() {
 }
 trap 'cleanup' INT TERM EXIT
 
-if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks" ]; then
+if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/environments/tarballs" ]; then
+  tarballs=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/environments/tarballs && find . -type f)
+  hostname=$(echo $hostnames | awk '{ print $1; }')
+
+  if [ -n "$hostname" ]; then
+    ghe-rsync -aH --delete \
+    -e "ssh -q $opts -p $port -F $config_file -l $user" \
+    --rsync-path="sudo -u git rsync" \
+    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/environments/tarballs/" \
+    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+
+    for tarball in $tarballs; do
+      env_id=$(echo $tarball | cut -d '/' -f 2)
+      ssh -q $opts -p $port -F $config_file -l $user $hostname "/bin/bash -c 'export PATH=\$PATH:/usr/local/share/enterprise && ghe-hook-env-update $env_id $GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs/$tarball'"
+    done
+  fi
+fi
+
+if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/repos" ]; then
   for hostname in $hostnames; do
     ghe-rsync -aH --delete \
     -e "ssh -q $opts -p $port -F $config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
-    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/" \
-    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/" &
+    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/repos/" \
+    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos" &
   done
 
   for pid in $(jobs -p); do
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-extract b/share/github-backup-utils/ghe-restore-git-hooks-extract
new file mode 100755
index 000000000..9b19f23a6
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-git-hooks-extract
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-git-hooks-extract <host>
+#/ Restore custom Git hooks environments from tarballs
+#/
+#/ Note: This command typically isn't called directly. It's invoked by
+#/ ghe-restore
+set -e
+
+# Bring in the backup configuration
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+if [ ! -d $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/environments/tarballs ]; then
+  echo "Warning: No pre-receive hook environments. Skipping ..."
+  exit 0
+fi
+
+tarballs=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/environments/tarballs && find . -type f)
+
+for tarball in $tarballs; do
+  env_id=$(echo $tarball | cut -d '/' -f 2)
+  ghe-ssh "$GHE_HOSTNAME" "/bin/bash -c 'export PATH=\$PATH:/usr/local/share/enterprise && ghe-hook-env-update $env_id $GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs/$tarball'"
+done
diff --git a/share/github-backup-utils/ghe-restore-userdata b/share/github-backup-utils/ghe-restore-userdata
index a544b75c3..abf1a6943 100755
--- a/share/github-backup-utils/ghe-restore-userdata
+++ b/share/github-backup-utils/ghe-restore-userdata
@@ -35,7 +35,7 @@ ghe_remote_version_required "$GHE_HOSTNAME"
 if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/$dirname" ]; then
   ghe-rsync -avz --delete \
       -e "ghe-ssh -p $(ssh_port_part "$GHE_HOSTNAME")" \
-      --rsync-path="sudo -u git rsync" \
+      --rsync-path="sudo -u git mkdir -p $GHE_REMOTE_DATA_USER_DIR/$dirname && sudo -u git rsync" \
       "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/$dirname/" \
       "$(ssh_host_part "$GHE_HOSTNAME"):$GHE_REMOTE_DATA_USER_DIR/$dirname" 1>&3
 fi
diff --git a/test/bin/ghe-hook-env-update b/test/bin/ghe-hook-env-update
new file mode 100755
index 000000000..77bcd3580
--- /dev/null
+++ b/test/bin/ghe-hook-env-update
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Emulates a remote GitHub import command. Each of the ghe-import-* utilities
+# that are run on the remote side have corresponding commands in this directory
+# that symlink to this file. The command just gobbles up stdin and writes a
+# simple success message.
+env_id=$1
+tarball=$2
+
+path=$(dirname $tarball)/../../
+mkdir -p $path/$1
+cd $path/$i
+tar -zxf $tarball
diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
index 2b7335cf6..1464cb1af 100755
--- a/test/test-ghe-backup.sh
+++ b/test/test-ghe-backup.sh
@@ -17,21 +17,30 @@ touch alice/index.html bob/index.html
 mkdir -p "$GHE_REMOTE_DATA_USER_DIR/common"
 echo "fake password hash data" > "$GHE_REMOTE_DATA_USER_DIR/common/manage-password"
 
-# Create some fake hookshot data in the remote data directory
 if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    # Create some fake data in the remote data directory
     mkdir -p "$GHE_REMOTE_DATA_USER_DIR/hookshot"
     cd "$GHE_REMOTE_DATA_USER_DIR/hookshot"
     mkdir -p repository-123 repository-456
     touch repository-123/test.bpack repository-456/test.bpack
 
-    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
-    cd "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
-    mkdir -p repository-123 repository-456
-    touch repository-123/script.sh repository-456/foo.sh
-fi
+    # Create some fake hooks in the remote data directory
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+    mkdir -p "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos"
 
-# Create some fake alambic data in the remote data directory
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    cd "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments"
+    mkdir -p 123/abcdef 456/fed314
+    touch 123/abcdef/script.sh 456/fed314/foo.sh
+
+    cd "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+    mkdir -p 123/abcdef 456/fed314
+    touch 123/abcdef/script.tar.gz 456/fed314/foo.tar.gz
+
+    cd "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos"
+    mkdir -p 321 654
+    touch 321/script.sh 654/foo.sh
+
+    # Create some fake alambic data in the remote data directory
     mkdir -p "$GHE_REMOTE_DATA_USER_DIR/alambic_assets/github-enterprise-assets/0000"
     touch "$GHE_REMOTE_DATA_USER_DIR/alambic_assets/github-enterprise-assets/0000/test.png"
 
@@ -127,8 +136,14 @@ begin_test "ghe-backup first snapshot"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
 
-        # verify all git hooks data was transferred
-        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks" "$GHE_DATA_DIR/current/git-hooks"
+        # verify all git hooks tarballs were transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs" "$GHE_DATA_DIR/current/git-hooks/environments/tarballs"
+
+        # verify the extracted environments were not transferred
+        ! diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments" "$GHE_DATA_DIR/current/git-hooks/environments"
+
+        # verify the extracted repositories were transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos" "$GHE_DATA_DIR/current/git-hooks/repos"
 
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
@@ -204,8 +219,14 @@ begin_test "ghe-backup subsequent snapshot"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
 
-        # verify all git hooks data was transferred
-        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks" "$GHE_DATA_DIR/current/git-hooks"
+        # verify all git hooks tarballs were transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs" "$GHE_DATA_DIR/current/git-hooks/environments/tarballs"
+
+        # verify the extracted environments were not transferred
+        ! diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments" "$GHE_DATA_DIR/current/git-hooks/environments"
+
+        # verify the extracted repositories were transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos" "$GHE_DATA_DIR/current/git-hooks/repos"
 
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
@@ -282,8 +303,14 @@ begin_test "ghe-backup with relative data dir path"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/hookshot" "$GHE_DATA_DIR/current/hookshot"
 
-        # verify all git hooks data was transferred
-        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks" "$GHE_DATA_DIR/current/git-hooks"
+        # verify all git hooks tarballs were transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs" "$GHE_DATA_DIR/current/git-hooks/environments/tarballs"
+
+        # verify the extracted environments were not transferred
+        ! diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments" "$GHE_DATA_DIR/current/git-hooks/environments"
+
+        # verify the extracted repositories were transferred
+        diff -ru "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos" "$GHE_DATA_DIR/current/git-hooks/repos"
 
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_REMOTE_DATA_USER_DIR/alambic_assets" "$GHE_DATA_DIR/current/alambic_assets"
@@ -375,8 +402,8 @@ begin_test "ghe-backup empty git-hooks directory"
 (
   set -e
 
-  rm -rf $GHE_REMOTE_DATA_USER_DIR/git-hooks/repository-*
-  rm -rf $GHE_DATA_DIR/current/git-hooks/repository-*
+  rm -rf $GHE_REMOTE_DATA_USER_DIR/git-hooks/*
+  rm -rf $GHE_DATA_DIR/current/git-hooks/*
   ghe-backup
 
   # Check that the "--link-dest arg does not exist" message hasn't occurred.
diff --git a/test/test-ghe-restore.sh b/test/test-ghe-restore.sh
index 7a765526c..a13f471c3 100755
--- a/test/test-ghe-restore.sh
+++ b/test/test-ghe-restore.sh
@@ -26,14 +26,25 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
     mkdir -p repository-123 repository-456
     touch repository-123/test.bpack repository-456/test.bpack
 
-    mkdir -p "$GHE_DATA_DIR/1/git-hooks"
-    cd "$GHE_DATA_DIR/1/git-hooks"
-    mkdir -p repository-123 repository-456
-    touch repository-123/script.sh repository-456/foo.sh
-fi
-
-# Create some fake alambic data in the remote data directory
-if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+    # Create some fake environments
+    mkdir -p "$GHE_DATA_DIR/1/git-hooks/environments/tarballs"
+    cd "$GHE_DATA_DIR/1/git-hooks/environments/tarballs"
+    mkdir -p 123 456
+    touch 123/script.sh 456/foo.sh
+    cd 123
+    tar -czf script.tar.gz script.sh
+    cd ../456
+    tar -czf foo.tar.gz foo.sh
+    cd ..
+    rm 123/script.sh 456/foo.sh
+    mkdir -p "$GHE_DATA_DIR/1/git-hooks/repos/1"
+    touch "$GHE_DATA_DIR/1/git-hooks/repos/1/bar.sh"
+
+    cd "$GHE_DATA_DIR/1/git-hooks/environments"
+    mkdir -p 123 456
+    touch 123/script.sh 456/foo.sh
+
+    # Create some fake alambic data in the remote data directory
     mkdir -p "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000"
     touch "$GHE_DATA_DIR/1/alambic_assets/github-enterprise-assets/0000/test.png"
 
@@ -128,7 +139,9 @@ begin_test "ghe-restore into configured vm"
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
         # verify all git hooks data was transferred
-        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/environments/tarballs" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+        ! diff -ru "$GHE_DATA_DIR/current/git-hooks/environments" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/repos" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos"
 
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
@@ -260,7 +273,9 @@ begin_test "ghe-restore -c into unconfigured vm"
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
         # verify all git hooks data was transferred
-        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/environments/tarballs" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+        ! diff -ru "$GHE_DATA_DIR/current/git-hooks/environments" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/repos" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos"
 
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
@@ -322,7 +337,9 @@ begin_test "ghe-restore into unconfigured vm"
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
         # verify all git hooks data was transferred
-        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/environments/tarballs" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+        ! diff -ru "$GHE_DATA_DIR/current/git-hooks/environments" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/repos" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos"
 
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"
@@ -373,8 +390,9 @@ begin_test "ghe-restore with host arg"
         # verify all hookshot user data was transferred
         diff -ru "$GHE_DATA_DIR/current/hookshot" "$GHE_REMOTE_DATA_USER_DIR/hookshot"
 
-        # verify all git hooks data was transferred
-        diff -ru "$GHE_DATA_DIR/current/git-hooks" "$GHE_REMOTE_DATA_USER_DIR/git-hooks"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/environments/tarballs" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+        ! diff -ru "$GHE_DATA_DIR/current/git-hooks/environments" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments"
+        diff -ru "$GHE_DATA_DIR/current/git-hooks/repos" "$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos"
 
         # verify all alambic assets user data was transferred
         diff -ru "$GHE_DATA_DIR/current/alambic_assets" "$GHE_REMOTE_DATA_USER_DIR/alambic_assets"

From 3dcb82d8cbaeaf2fd595d5883c19c5b453ad2783 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <sergio.rubio@github.com>
Date: Mon, 20 Jun 2016 21:09:31 +0200
Subject: [PATCH 278/288] Clusters: speedup repositories restore

We now rsync once per cluster node available instead of rsyncing each
Git repository individually.

Some simple benchmarks restoring a snapshot with 1183 repositories (13 GiB):

* Using backup-utils 2.6.1

```
real    20m34.923s
user    5m1.888s
sys 2m39.983s

```

* Using the new implementation

```
real    9m0.368s
user    2m46.912s
sys 1m18.746s
```

The old implementation is able to restore ~1 repo/s so restoring backup
snapshots with a large number of repositories and a fast network will benefit
the most from this.

Here's the time it takes to restore 8K repositories (~800 MiB), all of them
very similar in size (100K, with a single README file added):

* Using backup-utils 2.6.1

```
real    111m45.370s
user    7m54.829s
sys 6m38.247s
```

* Using the new implementation

```
real    6m20.087s
user    0m16.509s
sys 1m42.616s
```

In clusters with more than 3 Git server nodes, backup-utils 2.6.1 also
restores the repositories to all the Git server nodes available. Only three
copies of a Git repository are necessary so this patch also fixes that,
speeding things up and optimizing disk usage.

/cc @github/backup-utils
---
 bin/ghe-restore                               |   7 +-
 .../ghe-restore-repositories-dgit-ng          | 146 ++++++++++++++++++
 2 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100755 share/github-backup-utils/ghe-restore-repositories-dgit-ng

diff --git a/bin/ghe-restore b/bin/ghe-restore
index 07deb5684..3ae96728d 100755
--- a/bin/ghe-restore
+++ b/bin/ghe-restore
@@ -217,7 +217,12 @@ bm_end "ghe-import-redis"
 
 if $cluster; then
   echo "Restoring Git repositories into cluster ..."
-  ghe-restore-repositories-dgit "$GHE_HOSTNAME" 1>&3
+  if ghe-ssh "$GHE_HOSTNAME" test -f /data/github/current/script/dgit-cluster-restore-routes; then
+    ghe_verbose "* Using ghe-restore-repositories-dgit-ng to restore"
+    ghe-restore-repositories-dgit-ng "$GHE_HOSTNAME" 1>&3
+  else
+    ghe-restore-repositories-dgit "$GHE_HOSTNAME" 1>&3
+  fi
 
   echo "Restoring Gists into cluster ..."
   if ghe-ssh "$GHE_HOSTNAME" test -f /data/github/current/script/gist-cluster-restore-routes; then
diff --git a/share/github-backup-utils/ghe-restore-repositories-dgit-ng b/share/github-backup-utils/ghe-restore-repositories-dgit-ng
new file mode 100755
index 000000000..651f3e63a
--- /dev/null
+++ b/share/github-backup-utils/ghe-restore-repositories-dgit-ng
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-repositories-dgit-ng <host>
+#/ Restore repositories fron an rsync snapshot of all Git repository data to a GitHub cluster.
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command when restoring into a cluster.
+set -e
+
+# Bring in the backup configuration
+. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+bm_start "$(basename $0)"
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+network_paths=$(cd $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/ && find repositories -mindepth 6 -maxdepth 7 -name \*.git -exec dirname {} \; | uniq | grep nw | cut -d / -f2-)
+
+if [ -z "$network_paths" ]; then
+  echo "Warning: Repositories backup missing. Skipping ..."
+  exit 0
+fi
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$GHE_HOSTNAME"
+
+# Generate SSH config for forwarding
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+tempdir=$(mktemp -d)
+ssh_config_file=$tempdir/ssh_config
+opts="$GHE_EXTRA_SSH_OPTS -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
+tmp_list=$tempdir/tmp_list
+to_restore=$tempdir/to_restore
+
+hostnames=$(ghe-ssh "$GHE_HOSTNAME" ghe-config --get-regexp cluster.*.hostname | cut -d ' ' -f 2)
+for hostname in $hostnames; do
+  echo "
+Host $hostname
+  ServerAliveInterval 60
+  ProxyCommand ssh -q $GHE_EXTRA_SSH_OPTS -p $port $user@$host nc.openbsd %h %p
+  StrictHostKeyChecking=no" >> $ssh_config_file
+done
+
+cleanup() {
+  for hostname in $hostnames; do
+    ghe-gc-enable -F $ssh_config_file $hostname:$port
+  done
+  rm -rf $tempdir
+}
+trap cleanup EXIT
+
+# Disable remote GC operations
+for hostname in $hostnames; do
+  ghe-gc-disable -F $ssh_config_file $hostname:$port
+done
+
+# Build a list of network paths to send to the server to calculate
+# the restore routes, something like:
+#
+# a/nw/a8/3f/02/100000855
+# a/nw/a8/bc/8d/100000880
+# a/nw/a5/06/81/100000659
+# a/nw/a5/84/6f/100000708
+# a/nw/a5/e0/01/146
+# ...
+#
+# One network path per line.
+OLDIFS=$IFS; IFS=$'\n'
+for path in $network_paths; do
+   # Get the network ID
+   # The nework id from a repository is the last component of the path
+   # i.e. /data/repositories/a/nw/a5/bf/c9/37 network ID would be 37
+   ghe_verbose "Adding network_path $path to the list of networks to send"
+   echo $path
+done > $tmp_list
+IFS=$OLDIFS
+
+# The server returns a list of routes:
+#
+# a/nw/a8/3f/02/100000855 dgit-node1 dgit-node2 dgit-node3
+# a/nw/a8/bc/8d/100000880 dgit-node1 dgit-node2 dgit-node4
+# a/nw/a5/06/81/100000659 dgit-node3 dgit-node2 dgit-node4
+# ...
+#
+# One route per line.
+cat $tmp_list | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dgit-cluster-restore-routes \
+ | while read route; do
+  ghe_verbose "Received route $route"
+  servers=$(echo $route | cut -d ' ' -f2-)
+  for server in $servers; do
+    network_path=$(echo $route | cut -d ' ' -f1)
+    ghe_verbose "Adding $network_path to $tempdir/$server.rsync"
+    echo "$network_path" >> $tempdir/$server.rsync
+  done
+
+  network_id=$(echo $network_path | awk -F/ '{print $(NF)}')
+  ghe_verbose "Route: $network_id /data/repositories/$network_path $servers"
+  echo "$network_id /data/repositories/$network_path $servers" >> $to_restore
+done
+
+# rsync all the repositories
+for file_list in $tempdir/*.rsync; do
+  server=$(basename $file_list .rsync)
+  ghe_verbose "* Transferring repositories to $server"
+  ghe-rsync -avrHR --delete \
+    -e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
+    --rsync-path="sudo -u git rsync" \
+    --files-from=$file_list \
+    "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/./" \
+    "$server:$GHE_REMOTE_DATA_USER_DIR/repositories/" 1>&3
+done
+
+# Tell dgit about the repositories restored
+cat $to_restore | ghe-ssh "$GHE_HOSTNAME" github-env ./bin/dgit-cluster-restore-finalize >&3
+
+if [ -d $GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info ]; then
+  ghe_verbose "* Transferring repository info data"
+  for route in `ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -p`; do
+    if ! ghe-rsync -av --delete \
+        -e "ssh -q $opts -p $port -F $ssh_config_file -l $user" \
+        --rsync-path="sudo -u git rsync" \
+        "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/repositories/info/" \
+        "$route:$GHE_REMOTE_DATA_USER_DIR/repositories/info" 1>&3; then
+      echo "Error restoring /data/repositories/info to $route"
+    fi
+  done
+else
+  ghe_verbose "* Removing repository info data"
+  ghe-ssh "$GHE_HOSTNAME" ghe-cluster-each -r git -- rm -f /data/repositories/info/*
+fi
+
+bm_end "$(basename $0)"

From 4f67e0be24629d78714fe7054bfdbe364de83c41 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Tue, 21 Jun 2016 21:08:49 +0200
Subject: [PATCH 279/288] Logging tweaks

Verbose rsync when using `ghe-restore` or `ghe-backup` with `-v`.

Print `ghe-hook-env-update` output when using verbose mode only.

/cc @dbussink
---
 share/github-backup-utils/ghe-backup-git-hooks-cluster |  2 +-
 .../github-backup-utils/ghe-restore-git-hooks-cluster  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
index 1cd0c243a..1d18dce53 100755
--- a/share/github-backup-utils/ghe-backup-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -94,7 +94,7 @@ rsync_git_hooks_data () {
     # Ensure target directory exists, is needed with subdirectories
     mkdir -p "$backup_dir/$subpath"
 
-    ghe-rsync -a \
+    ghe-rsync -av \
         -e "ssh -q $opts -p $port -F $config_file -l $user" $link_dest \
         --rsync-path='sudo -u git rsync' \
         "$host:$GHE_REMOTE_DATA_USER_DIR/git-hooks/$subpath/" \
diff --git a/share/github-backup-utils/ghe-restore-git-hooks-cluster b/share/github-backup-utils/ghe-restore-git-hooks-cluster
index 6dd1a7ee8..a34fd5dc3 100755
--- a/share/github-backup-utils/ghe-restore-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-restore-git-hooks-cluster
@@ -63,26 +63,26 @@ if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/environments/tarballs" ];
   hostname=$(echo $hostnames | awk '{ print $1; }')
 
   if [ -n "$hostname" ]; then
-    ghe-rsync -aH --delete \
+    ghe-rsync -avH --delete \
     -e "ssh -q $opts -p $port -F $config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
     "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/environments/tarballs/" \
-    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs"
+    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs" 1>&3
 
     for tarball in $tarballs; do
       env_id=$(echo $tarball | cut -d '/' -f 2)
-      ssh -q $opts -p $port -F $config_file -l $user $hostname "/bin/bash -c 'export PATH=\$PATH:/usr/local/share/enterprise && ghe-hook-env-update $env_id $GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs/$tarball'"
+      ssh -q $opts -p $port -F $config_file -l $user $hostname "/bin/bash -c 'export PATH=\$PATH:/usr/local/share/enterprise && ghe-hook-env-update $env_id $GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs/$tarball'" 1>&3 2>&3
     done
   fi
 fi
 
 if [ -d "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/repos" ]; then
   for hostname in $hostnames; do
-    ghe-rsync -aH --delete \
+    ghe-rsync -avH --delete \
     -e "ssh -q $opts -p $port -F $config_file -l $user" \
     --rsync-path="sudo -u git rsync" \
     "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/git-hooks/repos/" \
-    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos" &
+    "$hostname:$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos" 1>&3 &
   done
 
   for pid in $(jobs -p); do

From 825553ca2054db9b8caf0802a19a1ec87e50e68b Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 22 Jun 2016 19:42:45 +0200
Subject: [PATCH 280/288] Bump version: 2.6.2

A patch release that includes performance improvements for cluster
restores, bug fixes and other improvements:

* git-hooks fixes #231
* Cluster: speedup repositories restore #232
* Cluster: restore Git over SSH keys #230
* Benchmark restores #219
---
 debian/changelog                  | 10 ++++++++++
 share/github-backup-utils/version |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7f9aace82..a6fea9961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+github-backup-utils (2.6.2) UNRELEASED; urgency=medium
+
+    * git-hooks fixes #231
+    * Cluster: speedup repositories restore #232 (requires GitHub Enterprise
+      2.6.4)
+    * Cluster: restore Git over SSH keys #230
+    * Benchmark restores #219
+
+ -- Sergio Rubio <rubiojr@github.com>  Wed, 22 Jun 2016 19:36:06 +0200
+
 github-backup-utils (2.6.1) UNRELEASED; urgency=medium
 
   * Cluster: faster gist restores #220
diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 6a6a3d8e3..097a15a2a 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.6.1
+2.6.2

From 4221efa83f44a72631b97a9341c3c443960ff606 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <sergio.rubio@github.com>
Date: Mon, 27 Jun 2016 16:56:16 +0200
Subject: [PATCH 281/288] Git hooks backup fixes

Fixes a regression in backup-utils 2.6.2 when backing up GitHub Enterprise
clusters not using custom pre-receive Git hooks environments.
---
 bin/ghe-backup                                |  2 +-
 .../ghe-backup-git-hooks-cluster              | 44 ++++++++++++-------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/bin/ghe-backup b/bin/ghe-backup
index bc94c45bb..7002879a4 100755
--- a/bin/ghe-backup
+++ b/bin/ghe-backup
@@ -175,7 +175,7 @@ if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
 
         echo "Backing up custom Git hooks ..."
         ghe-backup-git-hooks-cluster ||
-        failures="$failures alambic_assets"
+        failures="$failures git-hooks"
     else
         echo "Backing up asset attachments ..."
         ghe-backup-userdata alambic_assets ||
diff --git a/share/github-backup-utils/ghe-backup-git-hooks-cluster b/share/github-backup-utils/ghe-backup-git-hooks-cluster
index 1d18dce53..295ce1c52 100755
--- a/share/github-backup-utils/ghe-backup-git-hooks-cluster
+++ b/share/github-backup-utils/ghe-backup-git-hooks-cluster
@@ -9,30 +9,30 @@ set -e
 # Bring in the backup configuration
 . $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
 
-# Split host:port into parts
-port=$(ssh_port_part "$GHE_HOSTNAME")
-host=$(ssh_host_part "$GHE_HOSTNAME")
-
-# Add user / -l option
-user="${host%@*}"
-[ "$user" = "$host" ] && user="admin"
-
-backup_dir="$GHE_SNAPSHOT_DIR/git-hooks"
-
-# Location of last good backup for rsync --link-dest
-backup_current="$GHE_DATA_DIR/current/git-hooks"
-
 # Verify rsync is available.
 if ! rsync --version 1>/dev/null 2>&1; then
     echo "Error: rsync not found." 1>&2
     exit 1
 fi
 
+bm_start "$(basename $0)"
+
+backup_dir="$GHE_SNAPSHOT_DIR/git-hooks"
+# Location of last good backup for rsync --link-dest
+backup_current="$GHE_DATA_DIR/current/git-hooks"
+
 # Perform a host-check and establish GHE_REMOTE_XXX variables.
 ghe_remote_version_required "$host"
 
-# Generate SSH config for forwarding
+# Split host:port into parts
+port=$(ssh_port_part "$GHE_HOSTNAME")
+host=$(ssh_host_part "$GHE_HOSTNAME")
 
+# Add user / -l option
+user="${host%@*}"
+[ "$user" = "$host" ] && user="admin"
+
+# Generate SSH config for forwarding
 config=""
 
 # git server hostnames
@@ -102,6 +102,16 @@ rsync_git_hooks_data () {
 }
 
 hostname=$(echo $hostnames | awk '{ print $1; }')
-ghe-ssh -F $config_file "$hostname:122" -- "sudo -u git [ -d '$GHE_REMOTE_DATA_USER_DIR/git-hooks' ]" || exit 0
-rsync_git_hooks_data $hostname:122 environments/tarballs
-rsync_git_hooks_data $hostname:122 repos
+if ghe-ssh -F $config_file "$hostname:122" -- "sudo -u git [ -d '$GHE_REMOTE_DATA_USER_DIR/git-hooks/environments/tarballs' ]"; then
+  rsync_git_hooks_data $hostname:122 environments/tarballs
+else
+  ghe_verbose "git-hooks environment tarballs not found. Skipping ..."
+fi
+
+if ghe-ssh -F $config_file "$hostname:122" -- "sudo -u git [ -d '$GHE_REMOTE_DATA_USER_DIR/git-hooks/repos' ]"; then
+  rsync_git_hooks_data $hostname:122 repos
+else
+  ghe_verbose "git-hooks repositories not found. Skipping ..."
+fi
+
+bm_end "$(basename $0)"

From 5605aab198c86536bc21af732e240453e660193e Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 29 Jun 2016 20:26:37 +0200
Subject: [PATCH 282/288] Update Bash Styleguide

* Use headers for linkability
* Some other minor tweaks
---
 STYLEGUIDE.md | 433 ++++++++++++++++++++++++++------------------------
 1 file changed, 228 insertions(+), 205 deletions(-)

diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index 12a5a7e93..739209d15 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -1,210 +1,233 @@
-# Bash styleguide
-
-If you've not done much Bash development before you may find these debugging tips useful: http://wiki.bash-hackers.org/scripting/debuggingtips
-
-1. Scripts must start with `#!/usr/bin/env bash`.
-
-1. Scripts must use `set -e`.
-   if the return value of a command can be ignored, suffix it with `|| true`
-
-  ``` bash
-  set -e
-  command_that_might_fail || true
-  command_that_should_not_fail
-  ```
-  
-  Note that ignoring an exit status with `|| true` is genrally not a good practice
-  though. Generally speaking it's better to handle the error.
-
-1. Scripts should not check exit status via `$?` manually. rely on `set -e` instead:
-
-  ``` bash
-  cmd
-  if [ $? -eq 0 ]; then
-    echo worked
-  fi
-  ```
-
-  should be written as:
-
-  ``` bash
-  set -e
-  if cmd; then
-    echo worked
-  fi
-  ```
-
-1. Scripts must include a usage, description and optional examples in this format:
-
-  ```bash
-  #/ Usage: ghe-this-is-my-script [options] <required_arg>
-  #/
-  #/ This is a brief description of the script's purpose.
-  #/
-  #/ OPTIONS:
-  #/   -h | --help                      Show this message.
-  #/   -l | --longopt <required_arg>    An option.
-  #/   -c <required_arg>                Another option.
-  #/
-  #/ EXAMPLES: (optional section but nice to have when not trivial)
-  #/
-  #/    This will do foo and bar:
-  #/      $ ghe-this-is-my-script --longopt foobar -c 2
-  #/
-  ```
-
-  If there are no options or required arguments, that can be ignored.
-
-1. Customer-facing scripts must accept both `-h` and `--help` arguments and print the usage information with an `exit 2` status code.
-
-1. Scripts should not use Bash arrays.
-
-1. Scripts should use `test` or `[` whenever possible:
-
-  ``` bash
-  test -f /etc/passwd
-  test -f /etc/passwd -a -f /etc/group
-  if [ "string" = "string" ]; then
-    true
-  fi
-  ```
-
-1. Scripts may use `[[` for advanced bash features
-
-  ``` bash
-  if [[ "$(hostname)" = *.iad.github.net ]]; then
-    true
-  fi
-  ```
-
-1. Scripts may use bash for loops
-
-  ``` bash
-  for ((n=0; n<10; n++)); do
-  done
-  ```
-
-  or
-
-  ```bash
-  for i in $(seq 0 9); do
-  done
-  ```
-
-1. Scripts should use `$[x+y*z]` for mathematical expressions
-
-  ``` bash
-  local n=1
-  let n++
-  n=$[n+1] # preferred
-  n=$[$n+1]
-  n=$((n+1))
-  n=$(($n+1))
-  ```
-
-1. Scripts should use variables sparingly.
-   Short paths and other constants should be repeated liberally throughout
-   code since they can be search/replaced easily if they ever change.
-
-  ``` bash
-  DATA_DB_PATH=/data/user/db
-  mkdir -p $DATA_DB_PATH
-  rsync $DATA_DB_PATH remote:$DATA_DB_PATH
-  ```
-
-  vs the much more readable:
-
-  ``` bash
-  mkdir -p /data/user/db
-  rsync /data/user/db remote:/data/user/db
-  ```
-
-1. Scripts should use lowercase variables for locals,
-   and uppercase for variables inherited or exported via the environment:
-
-  ``` bash
-  #!/bin/bash
-  #/ Usage: [DEBUG=0] process_repo <nwo>
-  nwo=$1
-  [ -n $DEBUG ] && echo "** processing $nwo" >&2
-
-  export GIT_DIR=/data/repos/$nwo.git
-  git rev-list
-  ```
-
-1. Scripts should use `${var}` for interpolation only when required:
-
-  ``` bash
-  greeting=hello
-  echo $greeting
-  echo ${greeting}world
-  ```
-
-1. Scripts should use functions sparingly, opting for small/simple/sequential
-   scripts instead whenever possible when defining functions, use the following style:
-
-  ``` bash
-  my_function() {
-    local arg1=$1
-    [ -n $arg1 ] || return
-    ...
-  }
-  ```
+## Bash Styleguide
 
-1. Scripts should use `<<heredocs` when dealing with multi-line strings:
+If you've not done much Bash development before you may find these debugging tips useful: http://wiki.bash-hackers.org/scripting/debuggingtips.
 
-  - `<<eof` and `<< eof` will allow interpolation
-  - `<<"eof"` and `<<'eof'` will disallow interpolation
-  - `<<-eof` and `<<-"eof"` will strip off leading tabs first
-
-  ``` bash
-  cat <<"eof" | ssh $remote -- bash
-    foo=bar
-    echo $foo # interpolated on remote side after ssh
+--
+##### Scripts must start with `#!/usr/bin/env bash`
+
+--
+##### Scripts must use `set -e`
+
+If the return value of a command can be ignored, suffix it with `|| true`:
+
+```bash
+set -e
+command_that_might_fail || true
+command_that_should_not_fail
+```
+
+Note that ignoring an exit status with `|| true` is not a good practice though. Generally speaking, it's better to handle the error.
+
+--
+##### Scripts should not check exit status via `$?` manually
+
+Rely on `set -e` instead:
+
+```bash
+cmd
+if [ $? -eq 0 ]; then
+  echo worked
+fi
+```
+
+should be written as:
+
+```bash
+set -e
+if cmd; then
+  echo worked
+fi
+```
+
+--
+##### Scripts must include a usage, description and optional examples
+
+Use this format:
+
+```bash
+#!/usr/bin/env bash
+#/ Usage: ghe-this-is-my-script [options] <required_arg>
+#/
+#/ This is a brief description of the script's purpose.
+#/
+#/ OPTIONS:
+#/   -h | --help                      Show this message.
+#/   -l | --longopt <required_arg>    An option.
+#/   -c <required_arg>                Another option.
+#/
+#/ EXAMPLES: (optional section but nice to have when not trivial)
+#/
+#/    This will do foo and bar:
+#/      $ ghe-this-is-my-script --longopt foobar -c 2
+#/
+set -e
+```
+
+If there are no options or required arguments, the `OPTIONS` section can be ignored.
+
+--
+##### Customer-facing scripts must accept both -h and --help arguments
+
+They should also print the usage information and exit 2.
+
+For example:
+
+```bash
+#!/usr/bin/env bash
+#/ Usage: ghe-this-is-my-script [options] <required_arg>
+#/
+#/ This is a brief description of the script's purpose.
+set -e
+
+if [ "$1" = "--help" -o "$1" = "-h" ]; then
+  grep '^#/' <"$0" | cut -c 4-
+  exit 2
+fi
+
+```
+
+--
+##### Scripts should not use Bash arrays
+
+Main issues:
+
+* Portability
+* Important bugs in Bash versions < 4.3
+
+--
+##### Scripts should use `test` or `[` whenever possible
+
+```bash
+test -f /etc/passwd
+test -f /etc/passwd -a -f /etc/group
+if [ "string" = "string" ]; then
+  true
+fi
+```
+
+--
+##### Scripts may use `[[` for advanced bash features
+
+```bash
+if [[ "$(hostname)" = *.iad.github.net ]]; then
+  true
+fi
+```
+
+--
+##### Scripts may use Bash for loops
+
+Preferred:
+
+```bash
+for i in $(seq 0 9); do
+done
+```
+
+or:
+
+```bash
+for ((n=0; n<10; n++)); do
+done
+```
+
+--
+##### Scripts should use `$[x+y*z]` for mathematical expressions
+
+```bash
+local n=1
+let n++
+n=$[n+1] # preferred
+n=$[$n+1]
+n=$((n+1))
+n=$(($n+1))
+```
+
+--
+##### Scripts should use variables sparingly
+
+Short paths and other constants should be repeated liberally throughout code since they
+can be search/replaced easily if they ever change.
+
+```bash
+DATA_DB_PATH=/data/user/db
+mkdir -p $DATA_DB_PATH
+rsync $DATA_DB_PATH remote:$DATA_DB_PATH
+```
+
+versus the much more readable:
+
+```bash
+mkdir -p /data/user/db
+rsync /data/user/db remote:/data/user/db
+```
+
+--
+##### Scripts should use lowercase variables for locals, and uppercase for variables inherited or exported via the environment
+
+```bash
+#!/usr/bin/env bash
+#/ Usage: [DEBUG=0] process_repo <nwo>
+nwo=$1
+[ -n $DEBUG ] && echo "** processing $nwo" >&2
+
+export GIT_DIR=/data/repos/$nwo.git
+git rev-list
+```
+
+--
+##### Scripts should use `${var}` for interpolation only when required
+
+```bash
+greeting=hello
+echo $greeting
+echo ${greeting}world
+```
+
+--
+##### Scripts should use functions sparingly, opting for small/simple/sequential scripts instead whenever possible
+
+When defining functions, use the following style:
+
+```bash
+my_function() {
+  local arg1=$1
+  [ -n $arg1 ] || return
+  ...
+}
+```
+
+--
+##### Scripts should use `<<heredocs` when dealing with multi-line strings
+
+- `<<eof` and `<< eof` will allow interpolation
+- `<<"eof"` and `<<'eof'` will disallow interpolation
+- `<<-eof` and `<<-"eof"` will strip off leading tabs first
+
+```bash
+cat <<"eof" | ssh $remote -- bash
+  foo=bar
+  echo $foo # interpolated on remote side after ssh
 eof
-  ```
+```
 
-  ``` bash
-  bar=baz
-  cat <<eof | ssh $remote -- bash
-    echo $bar > /etc/foo # interpolated before ssh
-    chmod 0600 /etc/foo
+```bash
+bar=baz
+cat <<eof | ssh $remote -- bash
+  echo $bar > /etc/foo # interpolated before ssh
+  chmod 0600 /etc/foo
 eof
-  ```
-
-1. Scripts should quote variables that could reasonably have a space now or in
-   the future:
-
-  ``` bash
-  if [ ! -z "$packages" ]; then
-    true
-  fi
-  ```
-
-## Writing tests
-
-1. All tests should use `set -e` before making any assertions:
-
-  ```bash
-  begin_test "echo works"
-  (
-    set -e
-  
-    echo passing | grep passing
-  )
-  end_test
-  ```
-
-1. If you want to assert failure, please resist the urge to disable `set -e` and
-instead use negation with `!`:
-
-  ```bash
-  begin_test "netcat is not from bsd"
-  (
-    set -e
-    setup
-  
-    ! nc -h 2>&1 | grep bsd
-  )
-  end_test
-  ```
+```
+
+--
+##### Scripts should quote variables that could reasonably have a space now or in the future
+
+```bash
+if [ ! -z "$packages" ]; then
+  true
+fi
+```
+
+### Testing
+
+See [this README](../test/README.md)

From 0b427af98da22b50ac57c6975cf3a7f36d026cdf Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 29 Jun 2016 20:30:57 +0200
Subject: [PATCH 283/288] Add tests styleguide

---
 test/README.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 test/README.md

diff --git a/test/README.md b/test/README.md
new file mode 100644
index 000000000..d5fb3036a
--- /dev/null
+++ b/test/README.md
@@ -0,0 +1,37 @@
+--
+### Writing tests
+
+See also the [Bash style guide](../README.md)
+
+--
+##### all tests should use `set -e` and call `setup` before making any assertions
+
+Like this:
+
+```bash
+begin_test "echo works"
+(
+  set -e
+  setup
+
+  echo passing | grep passing
+)
+end_test
+```
+
+--
+##### Resist the urge to disable `set -e`
+
+If you want to assert failure, please resist the urge to disable `set -e` and
+instead use negation with `!`:
+
+```bash
+begin_test "netcat is not from bsd"
+(
+  set -e
+  setup
+
+  ! nc -h 2>&1 | grep bsd
+)
+end_test
+```

From dcec6149cc673fbefcc5a090e5973ecd9b8edf63 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 29 Jun 2016 20:31:58 +0200
Subject: [PATCH 284/288] Renamed tests styleguide

---
 test/{README.md => STYLEGUIDE.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/{README.md => STYLEGUIDE.md} (100%)

diff --git a/test/README.md b/test/STYLEGUIDE.md
similarity index 100%
rename from test/README.md
rename to test/STYLEGUIDE.md

From b744cfe6100b91ee5ae1c85b07f7114253bf5198 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 29 Jun 2016 20:34:14 +0200
Subject: [PATCH 285/288] Fix link

---
 STYLEGUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md
index 739209d15..a0a25d994 100644
--- a/STYLEGUIDE.md
+++ b/STYLEGUIDE.md
@@ -230,4 +230,4 @@ fi
 
 ### Testing
 
-See [this README](../test/README.md)
+See [the style guide](../test/STYLEGUIDE.md)

From 929860422766537f913d65df313bf3a435e08059 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 29 Jun 2016 20:34:45 +0200
Subject: [PATCH 286/288] Fix document name

---
 test/STYLEGUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/STYLEGUIDE.md b/test/STYLEGUIDE.md
index d5fb3036a..0b14be40d 100644
--- a/test/STYLEGUIDE.md
+++ b/test/STYLEGUIDE.md
@@ -1,7 +1,7 @@
 --
 ### Writing tests
 
-See also the [Bash style guide](../README.md)
+See also the [Bash style guide](../STYLEGUIDE.md)
 
 --
 ##### all tests should use `set -e` and call `setup` before making any assertions

From 1fc2c334c0a650826b188b89c2298f1f294d6ba0 Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 29 Jun 2016 21:07:09 +0200
Subject: [PATCH 287/288] Bump version: 2.6.3

Patch release that fixes a regression in backup-utils 2.6.2:

* Cluster: git-hooks backup fixes #235
---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a6fea9961..8edfa30a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+github-backup-utils (2.6.3) UNRELEASED; urgency=medium
+
+  * Cluster: git-hooks backup fixes #235
+
+ -- Sergio Rubio <rubiojr@github.com>  Wed, 29 Jun 2016 21:05:21 +0200
+
 github-backup-utils (2.6.2) UNRELEASED; urgency=medium
 
     * git-hooks fixes #231

From 1d70c0f01fd7babb214818a7d9a05ca8598ce9ae Mon Sep 17 00:00:00 2001
From: Sergio Rubio <rubiojr@frameos.org>
Date: Wed, 29 Jun 2016 21:10:25 +0200
Subject: [PATCH 288/288] Bump the version file

---
 share/github-backup-utils/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/github-backup-utils/version b/share/github-backup-utils/version
index 097a15a2a..ec1cf33c3 100644
--- a/share/github-backup-utils/version
+++ b/share/github-backup-utils/version
@@ -1 +1 @@
-2.6.2
+2.6.3