From 7b164d8ea701baf67b4b7bdf530002c2871ec151 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 14 Feb 2011 14:44:23 -0200 Subject: Changes for puppet 2.6 --- files/check-puppetd.sh | 2 +- templates/puppet-node.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 %> -- cgit v1.2.3