From: Stephen Gran <steve@lobefin.net>
Date: Mon, 16 Apr 2012 11:49:48 +0000 (+0100)
Subject: I think we can get rid of the deprecation notices
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4b11b33253f315e05c3d4b48e8a4110f31dbb16d;p=dsa-puppet.git

I think we can get rid of the deprecation notices

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/files/puppet.conf b/modules/debian-org/files/puppet.conf
index ee7cd93f..8edb21da 100644
--- a/modules/debian-org/files/puppet.conf
+++ b/modules/debian-org/files/puppet.conf
@@ -13,7 +13,7 @@ pluginsync=true
 # This is the default environment for all clients
 environment=production
 
-[puppetmasterd]
+[master]
 templatedir=/etc/puppet/templates
 #libdir=/etc/puppet/lib
 environments = development,testing,production,staging
@@ -21,7 +21,7 @@ reports = store, http
 reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
 config_version = cat /etc/puppet/.config-version
 
-[puppetd]
+[agent]
 environments = development,testing,production,staging
 report = true