From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 20 Mar 2017 13:37:05 +0000 (+0100)
Subject: update puppet.conf.erb
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=089667914245150c97cf9d9d8daf63c7bffb278b;p=mirror%2Fdsa-puppet.git

update puppet.conf.erb

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb
index 4f6c659d6..3e4cfdc06 100644
--- a/modules/debian_org/templates/puppet.conf.erb
+++ b/modules/debian_org/templates/puppet.conf.erb
@@ -14,28 +14,16 @@ pluginsync=true
 environment=production
 
 <%- if scope.lookupvar('::hostname') == 'handel' -%>
-modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules
 
 [master]
-environments = production,staging
-reports = store
-config_version = cat /etc/puppet/.config-version
+environmentpath=/srv/puppet.debian.org/stages
+cadir  = /var/lib/puppet/ssl/ca
 storeconfigs = true
 thin_storeconfigs = true
 dbadapter=mysql
 dbuser=puppet
 dbpassword=<%= scope.lookupvar('dbpassword') %>
 dbserver=localhost
-
-[production]
-manifestdir=/srv/puppet.debian.org/stages/production/manifests
-fileserverconfig=/srv/puppet.debian.org/stages/production/fileserver.conf
-modulepath=/srv/puppet.debian.org/stages/production/modules:/srv/puppet.debian.org/stages/production/3rdparty/modules
-
-[staging]
-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]