diff options
author | John Keiser <jkeiser@opscode.com> | 2014-05-26 22:01:41 -0700 |
---|---|---|
committer | John Keiser <jkeiser@opscode.com> | 2014-05-26 22:01:41 -0700 |
commit | e9db4a08c81038b09921a67238bc3a9d83bf7b73 (patch) | |
tree | b77706bad4a0e2d0efb50ef7faae348ac8f3a283 | |
parent | ca23638fb6807c8e0abb7472242746d2e3502c8b (diff) | |
download | chef-zero-e9db4a08c81038b09921a67238bc3a9d83bf7b73.tar.gz |
Don't bother printing port if it's 80
-rw-r--r-- | lib/chef_zero/server.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb index 7b5f59e..d354e87 100644 --- a/lib/chef_zero/server.rb +++ b/lib/chef_zero/server.rb @@ -95,9 +95,9 @@ module ChefZero # def url @url ||= if @options[:host].include?(':') - "http://[#{@options[:host]}]:#{@options[:port]}" + URI("http://[#{@options[:host]}]:#{@options[:port]}").to_s else - "http://#{@options[:host]}:#{@options[:port]}" + URI("http://#{@options[:host]}:#{@options[:port]}").to_s end end @@ -284,7 +284,6 @@ module ChefZero # } # } def load_data(contents, org_name = 'chef') - data_store.create_dir('organizations', org_name) %w(clients environments nodes roles users).each do |data_type| if contents[data_type] dejsonize_children(contents[data_type]).each_pair do |name, data| |