From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 16 Oct 2016 07:20:39 +0000 (+0200)
Subject: Do not have production and staging section in puppet.conf on all clients
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=643e9eb39d992ff1ff3d57690fcfd8a7767b146a;p=mirror%2Fdsa-puppet.git

Do not have production and staging section in puppet.conf on all clients
---

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index d41e2a01a..f748c02c6 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -25,12 +25,6 @@ dbadapter=mysql
 dbuser=puppet
 dbpassword=<%= scope.lookupvar('dbpassword') %>
 dbserver=localhost
-<%- end -%>
-
-[agent]
-environments = development,testing,production,staging
-report = true
-configtimeout = 240
 
 [production]
 manifestdir=/srv/puppet.debian.org/stages/production/manifests
@@ -41,3 +35,9 @@ modulepath=/srv/puppet.debian.org/stages/production/modules:/srv/puppet.debian.o
 manifestdir=/srv/puppet.debian.org/stages/staging/manifests
 fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
 modulepath=/srv/puppet.debian.org/stages/staging/modules:/srv/puppet.debian.org/stages/staging/3rdparty/modules
+<%- end -%>
+
+[agent]
+environments = development,testing,production,staging
+report = true
+configtimeout = 240