Merge remote-tracking branch 'public/master'

Author: zachary-mark

share/github-backup-utils/ghe-backup-config

@@ -468,7 +468,7 @@ is_external_database_snapshot(){
 # This file exists if this is a backup for an external database AND the backup was
 # taken via our logical backup strategy.
 is_default_external_database_snapshot(){
-  is_external_database_snapshot && test -f "$1/logical-external-database-backup-sentinel"
+  is_external_database_snapshot && test -f "$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT/logical-external-database-backup-sentinel"
 }
 
 prompt_for_confirmation(){

share/github-backup-utils/ghe-backup-mssql

@@ -180,6 +180,9 @@ if [ -n "$backup_command" ]; then
   ghe-ssh "$GHE_HOSTNAME" -- "$backup_command" || failures="$failures mssql"
   bm_end "$(basename $0)"
 
+  # Configure the backup cadence on the appliance, which is used for diagnostics
+  ghe-ssh "$GHE_HOSTNAME" "ghe-config mssql.backup.cadence $GHE_MSSQL_BACKUP_CADENCE"
+
   # Transfer backup files from appliance to backup host
   appliance_dir="$GHE_REMOTE_DATA_DIR/user/mssql/backups"
   backups=$(echo "set -o pipefail; if sudo test -d \"$appliance_dir\"; then \