From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 14 Feb 2011 16:44:23 +0000 (-0200)
Subject: Changes for puppet 2.6
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7b164d8ea701baf67b4b7bdf530002c2871ec151;p=puppet-puppet.git

Changes for puppet 2.6
---

diff --git a/files/check-puppetd.sh b/files/check-puppetd.sh
index fbf6988..c886ea3 100644
--- a/files/check-puppetd.sh
+++ b/files/check-puppetd.sh
@@ -3,7 +3,7 @@
 # check if puppet is running
 #
 
-PID="/var/run/puppet/puppetd.pid"
+PID="/var/run/puppet/agent.pid"
 INIT="/etc/init.d/puppet"
 
 if [ ! -f "$PID" ]; then
diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb
index cf287de..0a1943c 100644
--- a/templates/puppet-node.conf.erb
+++ b/templates/puppet-node.conf.erb
@@ -6,7 +6,7 @@ rundir        = /var/run/puppet
 factpath      = $vardir/lib/facter
 pluginsync    = true
 
-[puppetd]
+[agent]
 vardir        = /var/lib/puppet
 ssldir        = $vardir/ssl
 server        = puppet.<%= domain %>