simplify server config files, and add keyserver config variables.

diff --git a/etc/authentication/config b/etc/authentication/config
deleted file mode 100644 (file)
index c9b57d2..0000000
--- a/etc/authentication/config
+++ /dev/null
@@ -1,28 +0,0 @@
-# Monkeysphere authentication configuration file.
-
-# This is an sh-style shell configuration file.  Variable names should
-# be separated from their assignments by a single '=' and no spaces.
-# Environment variables with the same names as these variables but
-# prefaced by "MONKEYSPHERE_" will take precedence over the values
-# specified here.
-
-# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
-# increasing order of verbosity.
-#LOG_LEVEL=INFO
-
-# User who controls the monkeysphere 'sphere' keyring.
-#MONKEYSPHERE_USER=monkeysphere
-
-# Path to authorized_user_ids file to process to create
-# authorized_keys file.  '%h' will be replaced by the home directory
-# of the user, and '%u' will be replaced by the username of the user.
-# For purely admin-controlled authorized_user_ids, you might put them
-# in /etc/monkeysphere/authorized_user_ids/%u, for instance.
-#AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids"
-
-# Path to a user controlled authorized_keys file to be added to the
-# monkeysphere-generated authorized_keys file.  '%h' will be replaced
-# by the home directory of the user, and '%u' will by replaced by the
-# username of the user.  Setting this variable to 'none' prevents the
-# inclusion of user controlled authorized_keys file.
-# RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"

diff --git a/etc/authentication/gpg.conf b/etc/authentication/gpg.conf
deleted file mode 100644 (file)
index 77b96e1..0000000
--- a/etc/authentication/gpg.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# Monkeysphere authentication GNUPG home gpg.conf
-
-# Location of the various Monkeysphere keyrings.
-# It is highly recommended that you
-#    DO NOT MODIFY
-# these variables.
-primary-keyring /var/lib/monkeysphere/authentication/sphere/pubring.gpg
-keyring /var/lib/monkeysphere/authentication/core/pubring.gpg
-
-# PGP keyserver to use for PGP queries.
-keyserver hkp://pool.sks-keyservers.net
-
-# GPG list options.  It is recommended that you have at least
-# "show-uid-validity".
-list-options show-uid-validity

diff --git a/etc/host/config b/etc/host/config
deleted file mode 100644 (file)
index 293cbe0..0000000
--- a/etc/host/config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Monkeysphere host configuration file.
-
-# This is an sh-style shell configuration file.  Variable names should
-# be separated from their assignments by a single '=' and no spaces.
-# Environment variables with the same names as these variables but
-# prefaced by "MONKEYSPHERE_" will take precedence over the values
-# specified here.
-
-# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
-# increasing order of verbosity.
-#LOG_LEVEL=INFO

diff --git a/etc/host/gpg.conf b/etc/host/gpg.conf
deleted file mode 100644 (file)
index 66c668b..0000000
--- a/etc/host/gpg.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Monkeysphere host GNUPG home gpg.conf
-
-# GPG list options.  It is recommended that you have at least
-# "show-uid-validity".
-list-options show-uid-validity

diff --git a/etc/monkeysphere-authentication.conf b/etc/monkeysphere-authentication.conf
new file mode 100644 (file)
index 0000000..ea40966
--- /dev/null
+++ b/etc/monkeysphere-authentication.conf
@@ -0,0 +1,31 @@
+# Monkeysphere authentication configuration file.
+
+# This is an sh-style shell configuration file.  Variable names should
+# be separated from their assignments by a single '=' and no spaces.
+# Environment variables with the same names as these variables but
+# prefaced by "MONKEYSPHERE_" will take precedence over the values
+# specified here.
+
+# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+# increasing order of verbosity.
+#LOG_LEVEL=INFO
+
+# OpenPGP keyserver
+#KEYSERVER=pool.sks-keyservers.net
+
+# User who controls the monkeysphere 'sphere' keyring.
+#MONKEYSPHERE_USER=monkeysphere
+
+# Path to authorized_user_ids file to process to create
+# authorized_keys file.  '%h' will be replaced by the home directory
+# of the user, and '%u' will be replaced by the username of the user.
+# For purely admin-controlled authorized_user_ids, you might put them
+# in /etc/monkeysphere/authorized_user_ids/%u, for instance.
+#AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids"
+
+# Path to a user controlled authorized_keys file to be added to the
+# monkeysphere-generated authorized_keys file.  '%h' will be replaced
+# by the home directory of the user, and '%u' will by replaced by the
+# username of the user.  Setting this variable to 'none' prevents the
+# inclusion of user controlled authorized_keys file.
+# RAW_AUTHORIZED_KEYS="%h/.ssh/authorized_keys"

diff --git a/etc/monkeysphere-host.conf b/etc/monkeysphere-host.conf
new file mode 100644 (file)
index 0000000..80a4b65
--- /dev/null
+++ b/etc/monkeysphere-host.conf
@@ -0,0 +1,14 @@
+# Monkeysphere host configuration file.
+
+# This is an sh-style shell configuration file.  Variable names should
+# be separated from their assignments by a single '=' and no spaces.
+# Environment variables with the same names as these variables but
+# prefaced by "MONKEYSPHERE_" will take precedence over the values
+# specified here.
+
+# Log level.  Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in
+# increasing order of verbosity.
+#LOG_LEVEL=INFO
+
+# OpenPGP keyserver
+#KEYSERVER=pool.sks-keyservers.net