Changes for puppet 2.6

diff --git a/files/check-puppetd.sh b/files/check-puppetd.sh
index fbf698823144a963326993c0f54f3a27ed4e48d0..c886ea312e8bc15949c3ee58d2557a72296cce06 100644 (file)
--- 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 cf287deed924748961415e25fde0c26cf1c50434..0a1943c079706bffc5f3ec701cfea340edce5720 100644 (file)
--- 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 %>