Permalink
Browse files

Merge "change sample config to default to localhost"

  • Loading branch information...
2 parents ef3f57e + d98badc commit 9985d7632a8e61aa4b8ac19ef2d56b4c046f0be9 @pbozeman pbozeman committed with Gerrit Code Review Oct 5, 2012
Showing with 3 additions and 1 deletion.
  1. +2 −1 config/cloud_controller.yml
  2. +1 −0 spec/spec_helper.rb
@@ -1,4 +1,5 @@
---
+local_route: 127.0.0.1
port: 8181
pid_filename: /tmp/cloud_controller.pid
nats_uri: nats://127.0.0.1:4222
@@ -19,7 +20,7 @@ info:
# allow_debug: false
nginx:
- use_nginx: true
+ use_nginx: false
instance_socket: "/var/vcap/sys/run/cloud_controller_ng/cloud_controller.sock"
logging:
View
@@ -59,6 +59,7 @@ def config_override(hash)
def config
config_file = File.expand_path("../../config/cloud_controller.yml", __FILE__)
c = VCAP::CloudController::Config.from_file(config_file)
+ c[:nginx][:use_nginx] = true
c = c.merge(@config_override || {})
VCAP::CloudController::Config.configure(c)
c

0 comments on commit 9985d76

Please sign in to comment.