summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-02-16 13:58:00 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-02-16 13:58:00 +1100
commit458cb238e8cdde8d19977c1908c85ad32a7a6c78 (patch)
treec33ac62e7b0deed0910e647caf4f212a9459741e
parent2e41803bd30f12b91bcf753baf2c228eac126723 (diff)
downloadpuppet-458cb238e8cdde8d19977c1908c85ad32a7a6c78.tar.gz
puppet-458cb238e8cdde8d19977c1908c85ad32a7a6c78.tar.xz
puppet-458cb238e8cdde8d19977c1908c85ad32a7a6c78.zip
Fixed ticket #1070 - puppetrun configuration parse problem
-rwxr-xr-xbin/puppetrun2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/puppetrun b/bin/puppetrun
index fe981dadf..c92b59fc6 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -274,7 +274,7 @@ else
end
# Now parse the config
-config = File.join(Puppet[:confdir], "puppetmasterd.conf")
+config = File.join(Puppet[:confdir], "puppet.conf")
Puppet.parse_config(config)
if File.exists? config