diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-05-06 05:42:53 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-05-06 05:42:53 +0000 |
| commit | 494675b1dbf2f7141c201d203b197e03a30b72e3 (patch) | |
| tree | 0fc130b012161966829f907eb19f9b149ef5afd0 /bin/puppetd | |
| parent | 1f8de9d0c211ac5641f5ad827a0f478fff6bd223 (diff) | |
| download | puppet-494675b1dbf2f7141c201d203b197e03a30b72e3.tar.gz puppet-494675b1dbf2f7141c201d203b197e03a30b72e3.tar.xz puppet-494675b1dbf2f7141c201d203b197e03a30b72e3.zip | |
Fixing #206 and #422. Executables will still look for the deprecated config files and load them using the old parse method, but they now prefer a single configuration file, and files can set parameters (owner, mode, group) in brackets on the same line.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2464 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppetd')
| -rwxr-xr-x | bin/puppetd | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bin/puppetd b/bin/puppetd index 441c3e899..dcd1e87ff 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -272,9 +272,7 @@ rescue GetoptLong::InvalidOption => detail end # Now parse the config -if Puppet[:config] and File.exists? Puppet[:config] - Puppet.config.parse(Puppet[:config]) -end +Puppet.parse_config Puppet.genconfig Puppet.genmanifest |