summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanielsdeleo <dan@opscode.com>2013-11-18 16:04:53 -0800
committerdanielsdeleo <dan@opscode.com>2013-11-18 16:04:53 -0800
commitc3373e49b5d983e93dde4fd3000e27cf3232f1c8 (patch)
tree503ec5e3f59df467ded3d0afd4a9394474f70973
parent11d274d8ce43724e3d462451748c1d9ad6643e4a (diff)
downloadchef-zero-c3373e49b5d983e93dde4fd3000e27cf3232f1c8.tar.gz
Return server_url with IPv6-safe syntax
If the server is bound to a IPv6 address, the address needs to be wrapped in brackets, like http://[::1]:PORT
-rw-r--r--lib/chef_zero/server.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index 6c690c7..b5c4bbf 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -69,7 +69,8 @@ module ChefZero
def initialize(options = {})
options = DEFAULT_OPTIONS.merge(options)
@options = options
- @url = "http://#{options[:host]}:#{options[:port]}"
+ uri_safe_host = options[:host].include?(":") ? "[#{options[:host]}]" : options[:host]
+ @url = "http://#{uri_safe_host}:#{options[:port]}"
@generate_real_keys = options[:generate_real_keys]
ChefZero::Log.level = options[:log_level].to_sym