aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-09-19 08:51:23 +0000
committerMichael Scherer <misc@mageia.org>2011-09-19 08:51:23 +0000
commit94abb44a666c98f10793c1668f6c6fde8c3df184 (patch)
tree795c6d4df082df1a737b90f080df405b96d1fd6c
parent126a7abe212a263a9561c7da59556100420b266a (diff)
downloadpuppet-94abb44a666c98f10793c1668f6c6fde8c3df184.tar
puppet-94abb44a666c98f10793c1668f6c6fde8c3df184.tar.gz
puppet-94abb44a666c98f10793c1668f6c6fde8c3df184.tar.bz2
puppet-94abb44a666c98f10793c1668f6c6fde8c3df184.tar.xz
puppet-94abb44a666c98f10793c1668f6c6fde8c3df184.zip
allow to change environment easyly on commandline
-rw-r--r--modules/puppet/templates/puppet.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/puppet/templates/puppet.conf b/modules/puppet/templates/puppet.conf
index 32a41ad8..795e4040 100644
--- a/modules/puppet/templates/puppet.conf
+++ b/modules/puppet/templates/puppet.conf
@@ -39,7 +39,9 @@
splay = true
report = true
-
+<% if environment %>
+ environment = <%= environment %>
+<% end %>
# The file in which puppetd stores a list of the classes
# associated with the retrieved configuratiion. Can be loaded in
# the separate ``puppet`` executable using the ``--loadclasses``