Allow for specification of whether to check keyserver.

[monkeysphere.git] / src / monkeysphere-server

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 13221c5bcb6c029a51e73347751dc9fd8b270297..3cc7454faec27528e4e9822020a373010e6e2144 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # monkeysphere-server: MonkeySphere server admin tool
 #
@@ -47,7 +47,7 @@ gen_key() {
     # set key defaults
     KEY_TYPE=${KEY_TYPE:-"RSA"}
     KEY_LENGTH=${KEY_LENGTH:-"2048"}
-    KEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
+    KEY_USAGE=${KEY_USAGE:-"auth,encrypt"}
     SERVICE=${SERVICE:-"ssh"}
     HOSTNAME_FQDN=${HOSTNAME_FQDN:-$(hostname -f)}
 
@@ -113,7 +113,7 @@ MS_CONF=${MS_CONF:-"$MS_HOME"/monkeysphere-server.conf}
 # set empty config variable with defaults
 GNUPGHOME=${GNUPGHOME:-"$MS_HOME"/gnupg}
 KEYSERVER=${KEYSERVER:-subkeys.pgp.net}
-REQUIRED_KEY_CAPABILITY=${REQUIRED_KEY_CAPABILITY:-"e a"}
+REQUIRED_USER_KEY_CAPABILITY=${REQUIRED_USER_KEY_CAPABILITY:-"a"}
 USER_CONTROLLED_AUTHORIZED_KEYS=${USER_CONTROLLED_AUTHORIZED_KEYS:-%h/.ssh/authorized_keys}
 
 export GNUPGHOME
@@ -171,7 +171,7 @@ case $COMMAND in
 
     'trust-keys'|'trust-key'|'t')
        if [ -z "$1" ] ; then
-           failure "you must specify at least one key to trust."
+           failure "You must specify at least one key to trust."
        fi
 
        # process key IDs
@@ -184,10 +184,10 @@ case $COMMAND in
        uname="$1"
        shift
        if [ -z "$uname" ] ; then
-           failure "you must specify user."
+           failure "You must specify user."
        fi
        if [ -z "$1" ] ; then
-           failure "you must specify at least one userid."
+           failure "You must specify at least one user ID."
        fi
 
        # set variables for the user
@@ -202,7 +202,7 @@ case $COMMAND in
            update_userid "$userID" "$cacheDir"
        done
 
-       log "run the following to update user's authorized_keys file:"
+       log "Run the following to update user's authorized_keys file:"
        log "$PGRM update-users $uname"
        ;;
 
@@ -210,10 +210,10 @@ case $COMMAND in
        uname="$1"
        shift
        if [ -z "$uname" ] ; then
-           failure "you must specify user."
+           failure "You must specify user."
        fi
        if [ -z "$1" ] ; then
-           failure "you must specify at least one userid."
+           failure "You must specify at least one user ID."
        fi
 
        # set variables for the user
@@ -227,7 +227,7 @@ case $COMMAND in
            remove_userid "$userID"
        done
 
-       log "run the following to update user's authorized_keys file:"
+       log "Run the following to update user's authorized_keys file:"
        log "$PGRM update-users $uname"
        ;;