diff options
| author | Luke Kanies <luke@madstop.com> | 2007-09-25 00:43:15 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-09-25 00:43:15 -0500 |
| commit | 4679f4dcc110e3362b0097efe1d5a416c659611b (patch) | |
| tree | d8dd9aa3f220c7a1d8e3cb0d486e1a7bba7276f7 /lib/puppet/network/server | |
| parent | c3c3e519219ad80ac07d21c74849fbc4246c9d7a (diff) | |
| parent | cdc8ea6e81c1b5eba5ea784bb7079c4c1f3965a4 (diff) | |
| download | puppet-4679f4dcc110e3362b0097efe1d5a416c659611b.tar.gz puppet-4679f4dcc110e3362b0097efe1d5a416c659611b.tar.xz puppet-4679f4dcc110e3362b0097efe1d5a416c659611b.zip | |
Merge branch 'indirection' of git://reductivelabs.com/puppet-luke
Diffstat (limited to 'lib/puppet/network/server')
| -rw-r--r-- | lib/puppet/network/server/webrick.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/server/webrick.rb b/lib/puppet/network/server/webrick.rb index 3af0cfd3f..f24411ab3 100644 --- a/lib/puppet/network/server/webrick.rb +++ b/lib/puppet/network/server/webrick.rb @@ -48,7 +48,7 @@ module Puppet # yuck; separate http logs file = nil - Puppet.config.use(:main, :ssl, Puppet[:name]) + Puppet.settings.use(:main, :ssl, Puppet[:name]) if Puppet[:name] == "puppetmasterd" file = Puppet[:masterhttplog] else |