X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=8139387cca858152a2b9a2da42becbddabb04468;hb=74bd3557fe340555629fd8615c31fe4b6a8b8174;hp=084e0d51a19f03f4f3e9e1e37277427e0a18f421;hpb=c2dd8874fe0df18649d6ecbcbd39ced21624fbe1;p=monkeysphere.git

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 084e0d5..8139387 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -20,7 +20,7 @@ export SHARE
 VARLIB="/var/lib/monkeysphere"
 export VARLIB
 
-# date in UTF format if needed
+# UTC date in ISO 8601 format if needed
 DATE=$(date -u '+%FT%T')
 
 # unset some environment variables that could screw things up
@@ -157,7 +157,7 @@ update_users() {
     for uname in $unames ; do
 	# check all specified users exist
 	if ! getent passwd "$uname" >/dev/null ; then
-	    log verbose "----- unknown user '$uname' -----"
+	    log error "----- unknown user '$uname' -----"
 	    continue
 	fi
 
@@ -568,6 +568,14 @@ diagnostics() {
     warnwindow='2 months'
     warndate=$(date +%s -d "$warnwindow")
 
+    if ! id monkeysphere >/dev/null ; then
+	echo "! No monkeysphere user found!  Please create a monkeysphere system user."
+    fi
+
+    if ! [ -d "$VARLIB" ] ; then
+	echo "! no $VARLIB directory found.  Please create it."
+    fi
+
     echo "Checking host GPG key..."
     if (( "$keysfound" < 1 )); then
 	echo "! No host key found."
@@ -858,7 +866,7 @@ unset MONKEYSPHERE_USER
 # defaults
 LOG_LEVEL=${MONKEYSPHERE_LOG_LEVEL:=${LOG_LEVEL:="INFO"}}
 KEYSERVER=${MONKEYSPHERE_KEYSERVER:=${KEYSERVER:="subkeys.pgp.net"}}
-AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.config/monkeysphere/authorized_user_ids"}}
+AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:=${AUTHORIZED_USER_IDS:="%h/.monkeysphere/authorized_user_ids"}}
 RAW_AUTHORIZED_KEYS=${MONKEYSPHERE_RAW_AUTHORIZED_KEYS:=${RAW_AUTHORIZED_KEYS:="%h/.ssh/authorized_keys"}}
 MONKEYSPHERE_USER=${MONKEYSPHERE_MONKEYSPHERE_USER:=${MONKEYSPHERE_USER:="monkeysphere"}}