diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | lib/keyringer/actions/genkeys | 10 | ||||
| -rw-r--r-- | share/man/keyringer.1.mdwn | 5 |
3 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,7 @@ +2015-03-17 - Silvio Rhatto <rhatto@riseup.net> + + Rename genpair action and option (#69) + 2014-09-02 - Silvio Rhatto <rhatto@riseup.net> Ensure destination folder exists at 'cp' action diff --git a/lib/keyringer/actions/genkeys b/lib/keyringer/actions/genkeys index 60f9dfc..d4f24d8 100755 --- a/lib/keyringer/actions/genkeys +++ b/lib/keyringer/actions/genkeys @@ -199,11 +199,11 @@ if [ -z "$NODE" ]; then echo -e "Usage: keyringer <keyring> $BASENAME <gpg|ssh|x509|x509-self|ssl|ssl-self> <file> <hostname> [outfile]" echo -e "Options:" echo -e "\t gpg|ssh|x509[-self]|ssl|ssl[-self]: key type." - echo -e "\t file : base file name for encrypted output (relative to keys folder)," - echo -e "\t without spaces" - echo -e "\t hostname : host for the key pair" - echo -e "\t outfile : optional unencrypted output file, useful for deployment," - echo -e "\t without spaces" + echo -e "\t file : base file name for encrypted output (relative to keys folder)," + echo -e "\t without spaces" + echo -e "\t hostname : host for the key pair" + echo -e "\t outfile : optional unencrypted output file, useful for deployment," + echo -e "\t without spaces" exit 1 elif [ ! -e "$KEYDIR" ]; then echo "Folder not found: $KEYDIR, leaving" diff --git a/share/man/keyringer.1.mdwn b/share/man/keyringer.1.mdwn index 44ddb81..55ae216 100644 --- a/share/man/keyringer.1.mdwn +++ b/share/man/keyringer.1.mdwn @@ -150,9 +150,12 @@ encrypt-batch <*secret*> [*file*] : Encrypt content, batch mode. Behavior is identical to *encrypt* action, but less verbose. Useful inside scripts. -genpair <*ssh*|*gpg*|*ssl*|*ssl-self*> [*options*] +genkeys <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*] : Wrapper to generate encryption key-pairs, useful for automated key deployment. +genpair <*ssh*|*gpg*|*x509*|*x509-self*|*ssl*|*ssl-self*> [*options*] +: Alias for *genkeys* action. + open <*secret*> : Decrypt a secret into a temporary folder and open it using xdg-open, which tries to figure out the file type and then calls the associated application. |