diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/authentication/config (renamed from etc/monkeysphere-server.conf) | 8 | ||||
| -rw-r--r-- | etc/authentication/gpg.conf (renamed from etc/gnupg-authentication.conf) | 4 | ||||
| -rw-r--r-- | etc/host/config | 11 | ||||
| -rw-r--r-- | etc/host/gpg.conf (renamed from etc/gnupg-host.conf) | 0 |
4 files changed, 17 insertions, 6 deletions
diff --git a/etc/monkeysphere-server.conf b/etc/authentication/config index 8b9ffa4..c9b57d2 100644 --- a/etc/monkeysphere-server.conf +++ b/etc/authentication/config @@ -1,4 +1,4 @@ -# Monkeysphere server configuration file. +# 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. @@ -6,13 +6,13 @@ # prefaced by "MONKEYSPHERE_" will take precedence over the values # specified here. -# User who controls the monkeysphere authentication keyring. -#MONKEYSPHERE_USER=monkeysphere - # 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. diff --git a/etc/gnupg-authentication.conf b/etc/authentication/gpg.conf index 7e5620b..77b96e1 100644 --- a/etc/gnupg-authentication.conf +++ b/etc/authentication/gpg.conf @@ -4,8 +4,8 @@ # It is highly recommended that you # DO NOT MODIFY # these variables. -primary-keyring /var/lib/monkeysphere/gnupg-authentication/pubring.gpg -keyring /var/lib/monkeysphere/gnupg-host/pubring.gpg +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 diff --git a/etc/host/config b/etc/host/config new file mode 100644 index 0000000..293cbe0 --- /dev/null +++ b/etc/host/config @@ -0,0 +1,11 @@ +# 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/gnupg-host.conf b/etc/host/gpg.conf index 66c668b..66c668b 100644 --- a/etc/gnupg-host.conf +++ b/etc/host/gpg.conf |