Merge branch 'acmesh-official:master' into master

diff --cc deploy/ssh.sh
index 6039eefbda14860dd2e8d5865e346ed55f3681e3,89962621071a0e949e18b88ff1079b8ebfe95ebc..604d8642e23239fcb37e6e3de4c839da86cfd24b
--- 1/deploy/ssh.sh
--- 2/deploy/ssh.sh
+++ b/deploy/ssh.sh
@@@ -75,25 -74,9 +76,27 @@@ ssh_deploy() 
      Le_Deploy_ssh_cmd="ssh -T"
    fi
  
 +  # USE_SCP is optional. If not provided then default to previously saved
 +  # value (which may be undefined... equivalent to "no").
 +  if [ "$DEPLOY_SSH_USE_SCP" = "yes" ]; then
 +    Le_Deploy_ssh_use_scp="yes"
 +    _savedomainconf Le_Deploy_ssh_use_scp "$Le_Deploy_ssh_use_scp"
 +  elif [ "$DEPLOY_SSH_USE_SCP" = "no" ]; then
 +    Le_Deploy_ssh_use_scp=""
 +    _cleardomainconf Le_Deploy_ssh_use_scp
 +  fi
 +
 +  # SCP_CMD is optional. If not provided then use scp
 +  if [ -n "$DEPLOY_SSH_SCP_CMD" ]; then
 +    Le_Deploy_ssh_scp_cmd="$DEPLOY_SSH_SCP_CMD"
 +    _savedomainconf Le_Deploy_ssh_scp_cmd "$Le_Deploy_ssh_scp_cmd"
 +  elif [ -z "$Le_Deploy_ssh_scp_cmd" ]; then
 +    Le_Deploy_ssh_scp_cmd="scp -T"
 +  fi
 +
    # BACKUP is optional. If not provided then default to previously saved value or yes.
+   _getdeployconf DEPLOY_SSH_BACKUP
+   _debug2 DEPLOY_SSH_BACKUP "$DEPLOY_SSH_BACKUP"
    if [ "$DEPLOY_SSH_BACKUP" = "no" ]; then
      Le_Deploy_ssh_backup="no"
    elif [ -z "$Le_Deploy_ssh_backup" ] || [ "$DEPLOY_SSH_BACKUP" = "yes" ]; then