Merge pull request #124 from github/perms-fixes

Adjust ghe-backup file access for permissions changes in upcoming release

Author: rtomayko

share/github-backup-utils/ghe-backup-redis

@@ -16,12 +16,14 @@ 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)
     redis-cli BGSAVE 1>/dev/null
     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

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" -- "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