diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 14:44:23 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-14 14:44:23 -0200 |
| commit | 7b164d8ea701baf67b4b7bdf530002c2871ec151 (patch) | |
| tree | 00f591b9f1534b434ecf08cad180865b59209314 | |
| parent | 23b1c54cf46de587d9857299fbf508bace4dceb4 (diff) | |
| download | puppet-puppet-7b164d8ea701baf67b4b7bdf530002c2871ec151.tar.gz puppet-puppet-7b164d8ea701baf67b4b7bdf530002c2871ec151.tar.bz2 | |
Changes for puppet 2.6
| -rw-r--r-- | files/check-puppetd.sh | 2 | ||||
| -rw-r--r-- | 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 %> |