tweak some of the log output inconsequentially

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 5960ab4bd9b58a4742d031d368ffc7eb3375946c..e5109fd4ca1b7c1e6aa1482c5b3bceec2da9b2c7 100644 (file)
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -23,7 +23,7 @@ setup() {
 
     # deliberately replace the config files via truncation
     # FIXME: should we be dumping to tmp files and then moving atomically?
-    log debug "write core gpg.conf..."
+    log debug "writing core gpg.conf..."
     cat >"${GNUPGHOME_CORE}"/gpg.conf <<EOF
 # Monkeysphere trust core GnuPG configuration
 # This file is maintained by the Monkeysphere software.
@@ -32,7 +32,7 @@ no-greeting
 list-options show-uid-validity
 EOF
 
-    log debug "write sphere gpg.conf..."
+    log debug "writing sphere gpg.conf..."
     cat >"${GNUPGHOME_SPHERE}"/gpg.conf <<EOF
 # Monkeysphere trust sphere GnuPG configuration
 # This file is maintained by the Monkeysphere software.
@@ -44,7 +44,7 @@ EOF
 
     # make sure the monkeysphere user owns everything in the sphere
     # gnupghome
-    log debuf "fix sphere gnupg home ownership..."
+    log debuf "fixing sphere gnupg home ownership..."
     chown -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}"
     chgrp -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}"
 
@@ -75,16 +75,16 @@ EOF
     fi
 
     # export the core key to the sphere keyring
-    log debug "export core pub key to sphere keyring..."
+    log debug "exporting core pub key to sphere keyring..."
     gpg_core --export | gpg_sphere --import
 
     # ensure that the authentication sphere checker has absolute ownertrust on the expected key.
-    log debug "set ultimate owner trust on core key in gpg_sphere..."
+    log debug "setting ultimate owner trust on core key in gpg_sphere..."
     printf "%s:6:\n" "$CORE_FPR" | gpg_sphere --import-ownertrust
     gpg_sphere --export-ownertrust | log debug
 
     # check the owner trust
-    log debug "check gpg_sphere owner trust set properly..."
+    log debug "checking gpg_sphere owner trust set properly..."
     local ORIG_TRUST
     if ORIG_TRUST=$(gpg_sphere --export-ownertrust | grep '^[^#]') ; then
        if [ "${CORE_FPR}:6:" != "$ORIG_TRUST" ] ; then

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 653149fe1957f73b3c0d1f7ed4c4a7499fc6700e..b03e0d02833f84ac3bc06625bc58266f97187979 100644 (file)
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -21,6 +21,9 @@ local extendTo
 # get the new expiration date
 extendTo=$(get_gpg_expiration "$1")
 
+log info "setting host key expiration to ${extendTo}:"
+
+log debug "executing host expire script..."
 gpg_host_edit expire <<EOF
 $extendTo
 save

diff --git a/tests/basic b/tests/basic
index 6ee4eea7e8e2bdb02644fa3dff7e2bf6a5712d49..9844454543b53d42f525e150ec5587b123c421af 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -174,7 +174,6 @@ monkeysphere-host expert import-key testhost < "$TEMPDIR"/ssh_host_rsa_key
 echo "##################################################"
 echo "### setting host key expiration..."
 monkeysphere-host set-expire 1
-monkeysphere-host show-key
 # FIXME: how do we check that the expiration has really been set?
 
 echo "##################################################"