4 files changed, 7 insertions, 11 deletions
diff --git a/doc/TODO b/doc/TODO
index 6cc086a..bd887d1 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -53,10 +53,6 @@ File bug against ssh-keygen to see if we can get it to write to hash a
 When using ssh-proxycommand, if only host keys found are expired or
    revoked, then output loud warning with prompt, or fail hard.
 
-File bug against seahorse about how, when creating new primary keys,
-   it presents option for "RSA (sign only)" but then creates an "esca"
-   key.
-
 File bug against enigmail about lack of ability to create subkeys.
 
 Test and document what happens when any filesystem that the
diff --git a/src/common b/src/common
index 22ed1b1..ef70ef6 100644
--- a/src/common
+++ b/src/common
@@ -16,8 +16,8 @@
 ### COMMON VARIABLES
 
 # managed directories
-ETC="/etc/monkeysphere"
-export ETC
+SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
+export SYSCONFIGDIR
 
 ########################################################################
 ### UTILITY FUNCTIONS
diff --git a/src/monkeysphere b/src/monkeysphere
index 089c06e..78bf50d 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -270,7 +270,7 @@ unset HASH_KNOWN_HOSTS
 unset AUTHORIZED_KEYS
 
 # load global config
-[ -r "${ETC}/monkeysphere.conf" ] && . "${ETC}/monkeysphere.conf"
+[ -r "${SYSCONFIGDIR}/monkeysphere.conf" ] && . "${SYSCONFIGDIR}/monkeysphere.conf"
 
 # set monkeysphere home directory
 MONKEYSPHERE_HOME=${MONKEYSPHERE_HOME:="${HOME}/.monkeysphere"}
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index db3687b..6cef897 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -13,12 +13,12 @@
 ########################################################################
 PGRM=$(basename $0)
 
-SHARE=${MONKEYSPHERE_SHARE:="/usr/share/monkeysphere"}
+SHARE=${MONKEYSPHERE_SHARE:-"/usr/share/monkeysphere"}
 export SHARE
 . "${SHARE}/common" || exit 1
 
-VARLIB="/var/lib/monkeysphere"
-export VARLIB
+SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"
+export SYSDATADIR
 
 # UTC date in ISO 8601 format if needed
 DATE=$(date -u '+%FT%T')
@@ -914,7 +914,7 @@ unset RAW_AUTHORIZED_KEYS
 unset MONKEYSPHERE_USER
 
 # load configuration file
-[ -e ${MONKEYSPHERE_SERVER_CONFIG:="${ETC}/monkeysphere-server.conf"} ] && . "$MONKEYSPHERE_SERVER_CONFIG"
+[ -e ${MONKEYSPHERE_SERVER_CONFIG:="${SYSCONFIGDIR}/monkeysphere-server.conf"} ] && . "$MONKEYSPHERE_SERVER_CONFIG"
 
 # set empty config variable with ones from the environment, or with
 # defaults