From 643e9eb39d992ff1ff3d57690fcfd8a7767b146a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 16 Oct 2016 09:20:39 +0200 Subject: [PATCH] Do not have production and staging section in puppet.conf on all clients --- modules/debian-org/templates/puppet.conf.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 -- 2.20.1