emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ssh-deploy 4073f79 014/133: Updated documentation to su


From: Stefan Monnier
Subject: [elpa] externals/ssh-deploy 4073f79 014/133: Updated documentation to suggest ~/.authinfo.gpg usage
Date: Sat, 27 Mar 2021 14:48:34 -0400 (EDT)

branch: externals/ssh-deploy
commit 4073f7994cbf8f7bf607c10fa01d4634d0dc36da
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Updated documentation to suggest ~/.authinfo.gpg usage
---
 README.md     | 6 +++---
 ssh-deploy.el | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index ef0fd70..447ac42 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The `ssh-deploy` plug-in for Emacs makes it possible to 
effortlessly deploy loca
 * Open corresponding file on the remote host
 * Open SQL database-session on remote hosts
 * Run custom deployment scripts
-* All operations support asynchronous mode if `(make-thread`) or `async.el` is 
installed. (You need to setup an automatic authorization for this, i.e. 
`~/.netrc`, `~/.authinfo` or `~/.authinfo.gpg` and/or key-based password-less 
authorization)
+* All operations support asynchronous mode if `(make-thread`) or `async.el` is 
installed. (You need to setup an automatic authorization for this, i.e. 
`~/.authinfo.gpg` and/or key-based password-less authorization)
 
 The idea for this plug-in was to mimic the behavior of **PhpStorm** deployment 
functionality.
 
@@ -131,7 +131,7 @@ Host remote-host
 
 ## Interaction-free password-based setup on *NIX systems
 
-For automatic **FTP** connections you need to setup `~/.netrc`, `~/.authinfo` 
or `~/.authinfo.gpg` with your login credentials. An example of contents:
+For automatic **FTP** connections you need to setup `~/.authinfo.gpg` with 
your login credentials. An example of contents:
 
 ``` shell
 machine myserver.com login myuser port ftp password mypassword
@@ -224,7 +224,7 @@ By combining a `~/.authinfo.gpg` setup and a `public-key` 
setup you should be ab
 
 * Now when you save a file somewhere under the directory 
`/Users/username/Web/MySite/`, the script will launch and deploy the file with 
the remote server.
 * If you press `C-c C-z x` and the current buffer is a file, you will launch a 
`ediff` session showing differences between local file and remote file via 
TRAMP, or if current buffer is a directory it will open a buffer showing 
directory differences
-* If you press `C-c C-z f` you will **force** upload local file or directory 
to remote host even if they have external changes.
+w* If you press `C-c C-z f` you will **force** upload local file or directory 
to remote host even if they have external changes.
 * If you press `C-c C-z u` you will upload local file or directory to remote 
host.
 * If you press `C-c C-z d` you will download the current file or directory 
from remote host and then reload current buffer.
 * If you press `C-c C-z D` you will delete the current file or directory after 
a confirmation on local and remote host.
diff --git a/ssh-deploy.el b/ssh-deploy.el
index 04406a6..25612e3 100644
--- a/ssh-deploy.el
+++ b/ssh-deploy.el
@@ -40,9 +40,9 @@
 ;; ssh-deploy-root-local,ssh-deploy-root-remote, ssh-deploy-on-explicit-save
 ;; you can setup a directory for TRAMP deployment.
 ;;
-;; For asynchronous transfers you need to setup ~/.netrc, ~/.authinfo or 
~/.authinfo.gpg or key-based authorization or equivalent for automatic 
authentication.
+;; For asynchronous transfers you need to setup ~/.authinfo.gpg or key-based 
authorization or equivalent for automatic authentication.
 ;;
-;; Example contents of ~/.netrc, ~/.authinfo or ~/.authinfo.gpg for 
password-based interaction-free authentication:
+;; Example contents of ~/.authinfo.gpg for password-based interaction-free 
authentication:
 ;; machine myserver.com login myuser port ftp password mypassword
 ;; machine myserver2.com login myuser2 port ssh password mypassword2
 ;; machine myserver3.com login myuser3 port sftp password mypassword3
@@ -61,9 +61,6 @@
 ;; - To enable mode line to this:
 ;;    (ssh-deploy-line-mode)
 ;;
-;; - To enable mode line to this:
-;;    (ssh-deploy-line-mode)
-;;
 ;; - To set key-bindings do something like this:
 ;;     (global-set-key (kbd "C-c C-z f") 'ssh-deploy-upload-handler-forced)
 ;;     (global-set-key (kbd "C-c C-z u") 'ssh-deploy-upload-handler)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]