From 9e5fc76eb77a9b90afb384d34a8e5bf63f79af6e Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Mon, 19 Nov 2007 18:27:38 -0600 Subject: Fixing #911 and #912 -- there's a default environment (development) and you have to specify the valid environments for your site. --- lib/puppet/defaults.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib/puppet/defaults.rb') diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index a3991bbaa..da830952a 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -127,10 +127,15 @@ module Puppet namespaces and methods. This can be used as a coarse-grained authorization system for both ``puppetd`` and ``puppetmasterd``." ], - :environment => ["", "The environment Puppet is running in. For clients (e.g., ``puppetd``) this - determines the environment itself, which is used to find modules and much more. For - servers (i.e., ``puppetmasterd``) this provides the default environment for nodes we - know nothing about."], + :environments => ["production,development", "The valid environments for Puppet clients. + This is more useful as a server-side setting than client, but any + environment chosen must be in this list. Values should be + separated by a comma."], + :environment => ["development", "The environment Puppet is running in. For clients + (e.g., ``puppetd``) this determines the environment itself, which + is used to find modules and much more. For servers (i.e., + ``puppetmasterd``) this provides the default environment for nodes + we know nothing about."], :diff_args => ["", "Which arguments to pass to the diff command when printing differences between files."], :diff => ["diff", "Which diff command to use when printing differences between files."], :show_diff => [false, "Whether to print a contextual diff when files are being replaced. The diff -- cgit