diff options
author | Steven Danna <steve@opscode.com> | 2013-06-08 13:31:01 -0700 |
---|---|---|
committer | Steven Danna <steve@opscode.com> | 2013-06-08 13:37:44 -0700 |
commit | 1a7e1dfa58cb0309b74dba409b2c199ea061127e (patch) | |
tree | bb53ef7b4ca748c4cba1503caf33e563d7a84ce8 | |
parent | 196a4798d09b2b93866ebfe73b96bf2daba94f5f (diff) | |
download | chef-zero-1a7e1dfa58cb0309b74dba409b2c199ea061127e.tar.gz |
Allow chef-zero to listen on Unix domain socket.
Puma has support for unix domain sockets. This commit adds a -s
option to chef-zero that allows the user to specify a path rather than
an IP and port:
> chef-zero -s /tmp/chef-zero.sock
Clients can then connect to this socket:
> telnet -u /tmp/chef-server.sock
Trying /tmp/chef-server.sock...
Connected to (null).
Escape character is '^]'.
GET /nodes HTTP/1.1
HTTP/1.1 200 OK
Content-Type: application/json
Content-Length: 3
{
}
-rwxr-xr-x | bin/chef-zero | 4 | ||||
-rw-r--r-- | lib/chef_zero/server.rb | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/bin/chef-zero b/bin/chef-zero index b6b8a97..2d2f492 100755 --- a/bin/chef-zero +++ b/bin/chef-zero @@ -20,6 +20,10 @@ OptionParser.new do |opts| options[:port] = value end + opts.on("-s", "--socket PATH", String, "Unix socket path to listen on") do |value| + options[:sock] = value + end + opts.on("--[no-]generate-keys", "Whether to generate actual keys or fake it (faster). Default: false.") do |value| options[:generate_real_keys] = value end diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 65e1787..f2706be 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -60,6 +60,7 @@ module ChefZero DEFAULT_OPTIONS = { :host => '127.0.0.1', :port => 8889, + :sock => nil, :log_level => :info, :generate_real_keys => true }.freeze @@ -72,7 +73,12 @@ module ChefZero ChefZero::Log.level = options[:log_level].to_sym @server = Puma::Server.new(make_app, Puma::Events.new(STDERR, STDOUT)) - @server.add_tcp_listener(options[:host], options[:port]) + if options[:sock] + @server.add_unix_listener(options[:sock]) + else + @server.add_tcp_listener(options[:host], options[:port]) + end + @data_store = options[:data_store] || DataStore::MemoryStore.new end |