More cleanup:

[monkeysphere.git] / src / monkeysphere-server

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index a109cf533229c78074e1fe543e37569b49618321..ffb34522bd60ab264b0d05ef8a8bc778defee4f5 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -70,7 +70,7 @@ EOF
 )
     fi
 
-    log "The following key parameters will be used:"
+    echo "The following key parameters will be used:"
     echo "$keyParameters"
 
     read -p "generate key? [Y|n]: " OK; OK=${OK:=Y}
@@ -90,25 +90,10 @@ EOF
 EOF
 )
 
-    echo "generating server key..."
+    log "generating server key..."
     echo "$keyParameters" | gpg --batch --gen-key
 }
 
-# publish server key to keyserver
-publish_key() {
-    read -p "publish key to $KEYSERVER? [Y|n]: " OK; OK=${OK:=Y}
-    if [ ${OK/y/Y} != 'Y' ] ; then
-       failure "aborting."
-    fi
-
-    keyID=$(gpg --list-key --with-colons ="$USERID" 2> /dev/null | grep '^pub:' | cut -d: -f5)
-
-    # dummy command so as not to publish fakes keys during testing
-    # eventually:
-    #gpg --send-keys --keyserver "$KEYSERVER" "$keyID"
-    echo "NOT PUBLISHED: gpg --send-keys --keyserver $KEYSERVER $keyID"
-}
-
 ########################################################################
 # MAIN
 ########################################################################
@@ -129,7 +114,6 @@ GNUPGHOME=${GNUPGHOME:-"$MS_HOME"/gnupg}
 KEYSERVER=${KEYSERVER:-subkeys.pgp.net}
 REQUIRED_KEY_CAPABILITY=${REQUIRED_KEY_CAPABILITY:-"e a"}
 USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-%h/.ssh/authorized_keys}
-STAGING_AREA=${STAGING_AREA:-"$LIB"/stage}
 
 export GNUPGHOME
 
@@ -150,8 +134,8 @@ case $COMMAND in
            log "----- user: $uname -----"
 
            AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
-           cacheDir="$STAGING_AREA"/"$uname"/user_keys
-           msAuthorizedKeys="$STAGING_AREA"/"$uname"/authorized_keys
+           msAuthorizedKeys="$CACHE"/"$uname"/authorized_keys
+           cacheDir="$CACHE"/"$uname"/user_keys
 
             # make sure authorized_user_ids file exists
            if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
@@ -166,7 +150,7 @@ case $COMMAND in
            fi
 
            # update authorized_keys
-           update_authorized_keys "$cacheDir" "$msAuthorizedKeys" "$userAuthorizedKeys"
+           update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$cacheDir"
        done
 
        log "----- done. -----"
@@ -177,7 +161,7 @@ case $COMMAND in
        ;;
 
     'publish-key'|'p')
-       publish_key
+       publish_server_key
        ;;
 
     'trust-keys'|'t')
@@ -199,9 +183,9 @@ case $COMMAND in
            failure "you must specify at least one userid."
        fi
        AUTHORIZED_USER_IDS="$MS_HOME"/authorized_user_ids/"$uname"
-       userKeysCacheDir="$STAGING_AREA"/"$uname"/user_keys
+       cacheDir="$CACHE"/"$uname"/user_keys
        for userID ; do
-           update_userid "$userID" "$userKeysCacheDir"
+           update_userid "$userID" "$cacheDir"
        done
        ;;
 
@@ -211,6 +195,6 @@ case $COMMAND in
 
     *)
         failure "Unknown command: '$COMMAND'
-Type 'cereal-admin help' for usage."
+Type '$PGRM help' for usage."
         ;;
 esac