diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-17 23:13:31 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-17 23:13:31 -0500 |
| commit | c1924de73702d0f999a44bc63df9bee0d432636a (patch) | |
| tree | 0f3ef7031c6a30a30e2c6aefac204d9cd67a7e12 /src/share/mh | |
| parent | 79c139755848692f514080c470fcba3f48b77112 (diff) | |
fix ma so that the setup command is folded into the other commands, so
it's never needed to be run manually, and can therefore be supressed
in the usage/documentation. Also, add setup to the postinst script so
that it's setup on installation.
Also add pipefail to ma, and try to supress unnecessary gpg output,
and redirect other to log debug.
Diffstat (limited to 'src/share/mh')
| -rw-r--r-- | src/share/mh/import_key | 4 | ||||
| -rw-r--r-- | src/share/mh/set_expire | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/share/mh/import_key b/src/share/mh/import_key index d14fc13..557bb7f 100644 --- a/src/share/mh/import_key +++ b/src/share/mh/import_key @@ -46,7 +46,7 @@ chmod 700 "${GNUPGHOME_HOST}" log verbose "importing ssh key..." # translate ssh key to a private key PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \ - | gpg_host --import + | gpg_host --import 2>&1 | log debug # load the new host fpr into the fpr variable. this is so we can # create the gpg pub key file. we have to do this from the secret key @@ -57,6 +57,8 @@ load_fingerprint_secret # export to gpg public key to file update_gpg_pub_file +log info "host key imported:" + # show info about new key show_key diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire index 14d2501..ae7c13a 100644 --- a/src/share/mh/set_expire +++ b/src/share/mh/set_expire @@ -30,7 +30,7 @@ else log debug "extending without prompting." fi -log info "setting host key expiration to ${extendTo}:" +log info "setting host key expiration to ${extendTo}." log debug "executing host expire script..." gpg_host_edit expire <<EOF |