diff options
author | John Keiser <john@johnkeiser.com> | 2013-06-18 15:16:40 -0700 |
---|---|---|
committer | John Keiser <john@johnkeiser.com> | 2013-06-18 15:16:40 -0700 |
commit | 1603b53dbf72e8a2dc4bb9ab3c2b0b7320d24852 (patch) | |
tree | ae304d8b83abe68f4d1ed9749b40d5cf17b23683 | |
parent | 1f73df8c816b0702793d148f1e95bde88cc3d02a (diff) | |
parent | 264e4f3cabf7f952eb676bfff12a27e122716384 (diff) | |
download | chef-zero-1603b53dbf72e8a2dc4bb9ab3c2b0b7320d24852.tar.gz |
Merge pull request #20 from stevendanna/unix-socket-support
Allow chef-zero to listen on Unix domain socket.
-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 25c2364..aa2dd56 100755 --- a/bin/chef-zero +++ b/bin/chef-zero @@ -20,6 +20,10 @@ OptionParser.new do |opts| options[:port] = value end + opts.on("--socket PATH", String, "Unix socket path to listen on") do |value| + options[:socket] = 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..893599f 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, + :socket => 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[:socket] + @server.add_unix_listener(options[:socket]) + else + @server.add_tcp_listener(options[:host], options[:port]) + end + @data_store = options[:data_store] || DataStore::MemoryStore.new end |