diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-05 22:36:59 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-05 22:36:59 -0500 |
| commit | 38e2dcf35a1d9b19970d1fb253f6c09b0529e083 (patch) | |
| tree | d4e28bf2ebc43b73bfd36bfb72bf5b5da53e6ee7 /bin | |
| parent | 6e0d6ddf5ef1cd6b23a672020bb657744b5a2c59 (diff) | |
| download | puppet-38e2dcf35a1d9b19970d1fb253f6c09b0529e083.tar.gz puppet-38e2dcf35a1d9b19970d1fb253f6c09b0529e083.tar.xz puppet-38e2dcf35a1d9b19970d1fb253f6c09b0529e083.zip | |
The master is now functionally serving REST and xmlrpc.
...as far as I can tell. The client, however, is broken,
since it used the old http_pool/ssl_support stuff, which
no longer works.
I have to port puppetd over to using the new ssl stuff,
then I'll at least be able to verify that the master can
still speak xmlrpc.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/puppetmasterd | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd index 11b0d7fd0..57fc4bdb4 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -176,9 +176,13 @@ require 'puppet/file_serving/content' require 'puppet/file_serving/metadata' require 'puppet/checksum' -xmlrpc_handlers = [:Status, :FileServer, :Master, :Report, :CA, :Filebucket] +xmlrpc_handlers = [:Status, :FileServer, :Master, :Report, :Filebucket] rest_handlers = [:file_content, :file_metadata, :certificate, :facts, :catalog, :report, :checksum] +if Puppet[:ca] + xmlrpc_handlers << :CA +end + server = Puppet::Network::Server.new(:handlers => rest_handlers, :xmlrpc_handlers => xmlrpc_handlers) if Process.uid == 0 |