diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-01-31 19:41:22 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-01-31 19:41:22 -0500 |
| commit | 70a815c788108369e29443784e7b0632431834fe (patch) | |
| tree | 54832f119bf08ebea7dad16dd9e1155480cbc916 /etc | |
| parent | 93527967c043c99c708e209502292cf276877bf9 (diff) | |
simplify server config files, and add keyserver config variables.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/authentication/gpg.conf | 15 | ||||
| -rw-r--r-- | etc/host/gpg.conf | 5 | ||||
| -rw-r--r-- | etc/monkeysphere-authentication.conf (renamed from etc/authentication/config) | 3 | ||||
| -rw-r--r-- | etc/monkeysphere-host.conf (renamed from etc/host/config) | 3 |
4 files changed, 6 insertions, 20 deletions
diff --git a/etc/authentication/gpg.conf b/etc/authentication/gpg.conf deleted file mode 100644 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/gpg.conf b/etc/host/gpg.conf deleted file mode 100644 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/authentication/config b/etc/monkeysphere-authentication.conf index c9b57d2..ea40966 100644 --- a/etc/authentication/config +++ b/etc/monkeysphere-authentication.conf @@ -10,6 +10,9 @@ # increasing order of verbosity. #LOG_LEVEL=INFO +# OpenPGP keyserver +#KEYSERVER=pool.sks-keyservers.net + # User who controls the monkeysphere 'sphere' keyring. #MONKEYSPHERE_USER=monkeysphere diff --git a/etc/host/config b/etc/monkeysphere-host.conf index 293cbe0..80a4b65 100644 --- a/etc/host/config +++ b/etc/monkeysphere-host.conf @@ -9,3 +9,6 @@ # Log level. Can be SILENT, ERROR, INFO, VERBOSE, DEBUG, in # increasing order of verbosity. #LOG_LEVEL=INFO + +# OpenPGP keyserver +#KEYSERVER=pool.sks-keyservers.net |