diff options
| -rw-r--r-- | NOTICE | 3 | ||||
| -rw-r--r-- | README.txt | 15 | ||||
| -rw-r--r-- | bin/chef-screenrc | 9 | ||||
| -rw-r--r-- | chef/lib/chef/couchdb.rb | 3 |
4 files changed, 27 insertions, 3 deletions
@@ -7,5 +7,6 @@ Contributors and Copyright holders: * Copyright 2008, Adam Jacob <adam@hjksolutions.com> * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com> + * Copyright 2008, Bryan McLellan <btm@loftninjas.org> * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com> -
\ No newline at end of file + diff --git a/README.txt b/README.txt index 2de55af5f3..81ced454ce 100644 --- a/README.txt +++ b/README.txt @@ -24,9 +24,12 @@ RubyGems: * facter * ferret * merb-core +* merb-haml * haml -* ruby-openid +* ruby-openid (>= 2.0.1) * json +* ultraviolet +* mongrel External Servers: @@ -47,6 +50,16 @@ Install all of the above. To fire up a develpment environment, do the following chef-server -N -c 2 + * Test run chef to begin node registration: + + sudo ./bin/chef-client -l debug -c ./examples/config/chef-solo.rb + + * Validate the node registration: + + Visit http://localhost:4000 + Login, enter an openid URL (see http://openid.net/get/) + Registrations, click Validate + * Test run chef with: chef-client -l debug diff --git a/bin/chef-screenrc b/bin/chef-screenrc new file mode 100644 index 0000000000..0485a61913 --- /dev/null +++ b/bin/chef-screenrc @@ -0,0 +1,9 @@ +screen -t stompserver +!ruby /var/lib/gems/1.8/gems/stompserver-0.9.9/bin/stompserver +screen -t chefindexer +!bin/chef-indexer -l debug -c ./config/chef-server.rb +screen -t chef +!bin/chef-server +screen -t chefopenid +!bin/chef-server -p 4001 + diff --git a/chef/lib/chef/couchdb.rb b/chef/lib/chef/couchdb.rb index 22a651ca48..8f73839d13 100644 --- a/chef/lib/chef/couchdb.rb +++ b/chef/lib/chef/couchdb.rb @@ -37,6 +37,7 @@ class Chef end def create_design_document(name, data) + create_db to_update = true begin old_doc = @rest.get_rest("#{Chef::Config[:couchdb_database]}/_design%2F#{name}") @@ -146,4 +147,4 @@ class Chef end end -end
\ No newline at end of file +end |