From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 26 Dec 2009 16:57:11 +0000 (+0100)
Subject: tell puppet that we have a staging branch
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=3cf65a9432924a99cc409622c4b8f9037b57bb2c

tell puppet that we have a staging branch
---

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 931ce3ce..732dfffc 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -14,3 +14,6 @@ pluginsync=true
 [puppetmasterd]
 templatedir=/etc/puppet/templates
 libdir=/etc/puppet/lib
+
+[puppetd]
+environments = development,testing,production,staging