From: Daniel Kahn Gillmor Date: Fri, 12 Mar 2010 07:30:03 +0000 (-0500) Subject: documenting USE_VALIDATION_AGENT in configuration X-Git-Tag: monkeysphere_0.29~25 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=93dd8e30ae877ac3ee2e73a8303e3e797e27b944;p=monkeysphere.git documenting USE_VALIDATION_AGENT in configuration --- diff --git a/etc/monkeysphere.conf b/etc/monkeysphere.conf index 53adf83..3a06e8a 100644 --- a/etc/monkeysphere.conf +++ b/etc/monkeysphere.conf @@ -36,3 +36,7 @@ # The path to the SSH authorized_keys file. #AUTHORIZED_KEYS=~/.ssh/authorized_keys + +# Set to true to enable validation agent during X session startup +# where available. +#USE_VALIDATION_AGENT=false diff --git a/packaging/debian/70monkeysphere_use_validation_agent b/packaging/debian/70monkeysphere_use_validation_agent index 7c7a030..1335458 100644 --- a/packaging/debian/70monkeysphere_use_validation_agent +++ b/packaging/debian/70monkeysphere_use_validation_agent @@ -26,10 +26,10 @@ MSSYSCONFIG=/etc/monkeysphere/monkeysphere.conf MSUSERCONFIG="$HOME/.monkeysphere/monkeysphere.conf" if [ -x "$MSVAGENT" ] ; then - USEMSVAGENT=$(sh -c " + USEMSVAGENT=$(sh -c "USE_VALIDATION_AGENT= . '$MSSYSCONFIG' 2>/dev/null . '$MSUSERCONFIG' 2>/dev/null || : -printf '%s' "'"$MONKEYSPHERE_USE_VALIDATION_AGENT"') +printf '%s' "'"$USE_VALIDATION_AGENT"') if [ "$USEMSVAGENT" == "true" ] ; then STARTUP="$MSVAGENT $STARTUP"