Merge branch 'master' into containerize-travis

Author: rubiojr

bin/ghe-restore

@@ -200,6 +200,28 @@ fi
 ghe-backup-store-version  ||
 echo "Warning: storing backup-utils version remotely failed."
 
+# Stop cron and timerd, as scheduled jobs may disrupt the restore process.
+if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+  echo "Stopping cron and github-timerd ..."
+  if $cluster; then
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-each -- sudo service cron stop"; then
+      ghe_verbose "* Warning: Failed to stop cron on one or more nodes"
+    fi
+
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-each -- sudo service github-timerd stop"; then
+      ghe_verbose "* Warning: Failed to stop github-timerd on one or more nodes"
+    fi
+  else
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "sudo service cron stop"; then
+      ghe_verbose "* Warning: Failed to stop cron"
+    fi
+
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "sudo service github-timerd stop"; then
+      ghe_verbose "* Warning: Failed to stop github-timerd"
+    fi
+  fi
+fi
+
 # Restore settings and license if restoring to an unconfigured appliance or when
 # specified manually.
 if $restore_settings; then
@@ -323,6 +345,20 @@ elif $instance_configured; then
   fi
 fi
 
+# Start cron. Timerd will start automatically as part of the config run.
+if [ "$GHE_VERSION_MAJOR" -ge 2 ]; then
+  echo "Starting cron ..."
+  if $cluster; then
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "ghe-cluster-each -- sudo service cron start"; then
+      echo "* Warning: Failed to start cron on one or more nodes"
+    fi
+  else
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "sudo service cron start"; then
+      echo "* Warning: Failed to start cron"
+    fi
+  fi
+fi
+
 # Update the remote status to "complete". This has to happen before importing
 # ssh host keys because subsequent commands will fail due to the host key
 # changing otherwise.

debian/changelog

@@ -1,3 +1,10 @@
+github-backup-utils (2.8.1) UNRELEASED; urgency=medium
+
+  * Stop cron and timerd during restore #269
+  * Fix compatibility issue with older versions of OpenSSH #263
+
+ -- Sergio Rubio <[email protected]>  Mon, 14 Nov 2016 22:04:48 +0100
+
 github-backup-utils (2.8.0) UNRELEASED; urgency=low
 
   * Adds support for GitHub Enterprise 2.8.0

share/github-backup-utils/ghe-detect-leaked-ssh-keys

@@ -124,6 +124,8 @@ if $leaked_keys_found; then
     echo "* (An upgrade may be required)"
     echo
   fi
+else 
+  echo "* No leaked keys found"  
 fi
 
 # Cleanup temp dir

share/github-backup-utils/version

@@ -1 +1 @@
-2.8.0
+2.8.1

test/bin/service

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Fake service command for tests.
+true