Merge pull request #574 from github/stable

Merge stable into master to sync branches

Author: cainejette

bin/ghe-backup

@@ -81,6 +81,25 @@ if [ "$(ls -il dest1/testfile | awk '{ print $1 }')" != "$(ls -il dest2/testfile
 fi
 rm -rf src dest1 dest2
 
+# if we should use gitbackups to backup repositories
+should_use_gitbackups_for_repositories(){
+  ghe-ssh "$GHE_HOSTNAME" ghe-config --true "app.github.gitbackups"
+}
+
+# check that the appliance supports using gitbackups for repositories
+can_use_gitbackups_for_repositories(){
+  ghe-ssh "$GHE_HOSTNAME" test -e /data/github/current/bin/ghe-backup-repositories
+}
+
+# Exit early if the appliance is missing script to backup repositories using gitbackups
+if should_use_gitbackups_for_repositories; then
+  if ! can_use_gitbackups_for_repositories; then
+    echo "Error: Configuration setting 'app.github.gitbackups' is enabled but this version of GHES cannot use gitbackups to back up repositories via 'ghe-backup'."
+    echo "Disable configuration setting 'app.github.gitbackups' and re-run 'ghe-backup' to use rsync."
+    exit 1
+  fi
+fi
+
 # To prevent multiple backup runs happening at the same time, we create a
 # in-progress file with the timestamp and pid of the backup process,
 # giving us a form of locking.

debian/changelog

@@ -1,10 +1,22 @@
+github-backup-utils (2.19.4) UNRELEASED; urgency=medium
+
+  * Fix the way we connect to mysql master using ssh forwarding for binary backups #567
+
+ -- Hao Jiang <[email protected]>  Tue, 18 Feb 2020 17:54:31 +0000
+
 github-backup-utils (2.20.0) UNRELEASED; urgency=medium
 
   * Fix `ghe-backup-repositories` performance for large instances #541
   * Fix two issues with binary backup (slow gzip compression and support for restore from instances other than SQL master) #551
 
  -- Alejandro Figueroa <[email protected]>  Tue, 11 Feb 2020 20:47:17 +0000
 
+github-backup-utils (2.19.3) UNRELEASED; urgency=medium
+
+  * Fix two issues with binary backup (slow gzip compression and support for restore from instances other than SQL master) #551
+
+ -- Hao Jiang <[email protected]>  Tue, 11 Feb 2020 19:31:55 +0000
+
 github-backup-utils (2.19.2) UNRELEASED; urgency=medium
 
   * Fix `ghe-backup-repositories` performance for large instances #541
@@ -236,7 +248,7 @@ github-backup-utils (2.7.1) UNRELEASED; urgency=medium
 
 github-backup-utils (2.7.0) UNRELEASED; urgency=medium
 
-  * GitHub Enterprise 2.7.0 support 
+  * GitHub Enterprise 2.7.0 support
 
  -- Sergio Rubio <[email protected]>  Wed, 03 Aug 2016 20:25:31 +0200