summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-05-09 17:27:37 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-05-10 08:06:45 -0700
commit545e2852346b7cd1c3f8deb1f7204fc07816234f (patch)
tree239b06af2dcdb21a29e91a55ea90ab75122aa9d6
parent29364f75f484c78b0c0b9062d7158425882439f8 (diff)
downloadchef-545e2852346b7cd1c3f8deb1f7204fc07816234f.tar.gz
MAOR WIP
-rw-r--r--kitchen-tests/Gemfile.lock2
-rw-r--r--kitchen-tests/cookbooks/webapp/recipes/default.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/kitchen-tests/Gemfile.lock b/kitchen-tests/Gemfile.lock
index c0f5a812a7..7f2b240ba4 100644
--- a/kitchen-tests/Gemfile.lock
+++ b/kitchen-tests/Gemfile.lock
@@ -11,7 +11,7 @@ GIT
GIT
remote: git://github.com/test-kitchen/test-kitchen.git
- revision: 1abb6995e54558b90dc0894601ca14b8dac9157c
+ revision: 57d7906dd4277d3c57033bf4f6d7a2a1907986e4
branch: lcg/parallel-scp-upload
specs:
test-kitchen (1.8.0)
diff --git a/kitchen-tests/cookbooks/webapp/recipes/default.rb b/kitchen-tests/cookbooks/webapp/recipes/default.rb
index 2b3459b794..8884fbf62d 100644
--- a/kitchen-tests/cookbooks/webapp/recipes/default.rb
+++ b/kitchen-tests/cookbooks/webapp/recipes/default.rb
@@ -15,8 +15,8 @@ creds = Hash.new
end
web_app "webapp" do
- server_name "localhost"
- server_aliases [node["fqdn"], node["hostname"], "localhost.localdomain"]
+ server_name "127.0.0.1"
+ server_aliases [node["fqdn"], node["hostname"], "localhost.localdomain", "localhost"]
docroot node["webapp"]["path"]
cookbook "apache2"
end