X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=0ff06af5b261d67b0c3b011faef74f3687ff4b4c;hb=5c84af854b419250a79352ffc0bf4d66d1982d6a;hp=6eeb7021dc1de7965dd81e75f37fb509e5b2cca8;hpb=6a278713cc9fd475acae6bb131a44fc9b26ddac6;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 6eeb702..0ff06af 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -44,10 +44,10 @@ EOF
 # generate server gpg key
 gen_key() {
     # set key defaults
-    KEY_TYPE=${KEY_TYPE:-RSA}
-    KEY_LENGTH=${KEY_LENGTH:-2048}
-    KEY_USAGE=${KEY_USAGE:-encrypt,auth}
-    SERVICE=${SERVICE:-ssh}
+    KEY_TYPE=${KEY_TYPE:-"RSA"}
+    KEY_LENGTH=${KEY_LENGTH:-"2048"}
+    KEY_USAGE=${KEY_USAGE:-"encrypt,auth"}
+    SERVICE=${SERVICE:-"ssh"}
     HOSTNAME_FQDN=${HOSTNAME_FQDN:-$(hostname -f)}
 
     USERID=${USERID:-"$SERVICE"://"$HOSTNAME_FQDN"}
@@ -129,7 +129,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
 
@@ -145,12 +144,13 @@ case $COMMAND in
 	fi
 
 	for uname in $unames ; do
+	    MODE="authorized_keys"
+
 	    log "----- user: $uname -----"
 
-	    MODE="authorized_keys"
 	    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
@@ -165,8 +165,9 @@ case $COMMAND in
 	    fi
 
 	    # update authorized_keys
-	    update_authorized_keys "$cacheDir" "$msAuthorizedKeys" "$userAuthorizedKeys"
+	    update_authorized_keys "$msAuthorizedKeys" "$userAuthorizedKeys" "$cacheDir"
 	done
+
 	log "----- done. -----"
 	;;
 
@@ -197,9 +198,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
 	;;