From e1306b6f0fe4028b3d62538c15099b993e3c64c9 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 31 Jan 2009 16:42:02 -0500 Subject: - break out monkeysphere-server command into monkeysphere-{host,authentication} commands - break out etc config into host/authentication configs --- etc/authentication/config | 28 ++++++++++++++++++++++++++++ etc/authentication/gpg.conf | 15 +++++++++++++++ etc/gnupg-authentication.conf | 15 --------------- etc/gnupg-host.conf | 5 ----- etc/host/config | 11 +++++++++++ etc/host/gpg.conf | 5 +++++ etc/monkeysphere-server.conf | 28 ---------------------------- 7 files changed, 59 insertions(+), 48 deletions(-) create mode 100644 etc/authentication/config create mode 100644 etc/authentication/gpg.conf delete mode 100644 etc/gnupg-authentication.conf delete mode 100644 etc/gnupg-host.conf create mode 100644 etc/host/config create mode 100644 etc/host/gpg.conf delete mode 100644 etc/monkeysphere-server.conf (limited to 'etc') diff --git a/etc/authentication/config b/etc/authentication/config new file mode 100644 index 0000000..c9b57d2 --- /dev/null +++ b/etc/authentication/config @@ -0,0 +1,28 @@ +# 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 new file mode 100644 index 0000000..77b96e1 --- /dev/null +++ b/etc/authentication/gpg.conf @@ -0,0 +1,15 @@ +# 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/gnupg-authentication.conf b/etc/gnupg-authentication.conf deleted file mode 100644 index 7e5620b..0000000 --- a/etc/gnupg-authentication.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/gnupg-authentication/pubring.gpg -keyring /var/lib/monkeysphere/gnupg-host/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/gnupg-host.conf b/etc/gnupg-host.conf deleted file mode 100644 index 66c668b..0000000 --- a/etc/gnupg-host.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/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/host/gpg.conf b/etc/host/gpg.conf new file mode 100644 index 0000000..66c668b --- /dev/null +++ b/etc/host/gpg.conf @@ -0,0 +1,5 @@ +# 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-server.conf b/etc/monkeysphere-server.conf deleted file mode 100644 index 8b9ffa4..0000000 --- a/etc/monkeysphere-server.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Monkeysphere server 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. - -# 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 - -# 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" -- cgit v1.2.3