solokit 0.1.5 → 0.1.6

data/README.markdown

@@ -3,7 +3,7 @@ A toolkit for provisioning (ubuntu-)servers using chef-solo.
 Solokit
 ---
 
-* A set of wrappers around SSH and Chef Solo. 
+* A set of wrappers around SSH and Chef Solo for getting cookbooks and recipes to servers and running them.
 * Code for setting up user accounts (optionally setting passwords, ssh-keys and sudo access).
 * Uses nesting to override configuration and cookbooks.
 
@@ -14,7 +14,7 @@ Solokit includes some defaults so that you don't have to repeat the same things
 
 An environment can be anything from one server to a complete cluster. Within an environment you can run specific configuration for each server, but Solokit defaults to "server.json".
 
-For each layer, Solokit looks for a directory structure like this:
+For each layer*, Solokit looks for a directory structure like this:
 
     cookbooks/upstream # Unchanged cookbooks downloaded from opscode or other upstream source.
     cookbooks/site     # Changes or entierly new cookbooks for Solokit, your project or env.
@@ -22,6 +22,8 @@ For each layer, Solokit looks for a directory structure like this:
     chef/server.json   # Default config, just calls roles/base.rb.
     chef/roles/base.rb # Base configuration
 
+*Except for within an environment where all cookbooks are considered site-cookbooks (example path: envs/test/cookbooks).
+
 Usage
 ---
 
@@ -73,7 +75,7 @@ Add user configuration to users.yml (optional, but you need to provide a chef/ro
 Add keys below "public_keys" that have names ending in ".pub".
 
     mkdir -p public_keys
-    echo "your key" > public_keys/your_key@computer.pub
+    echo "your key" > public_keys/user@computer.pub
     
 By default this setup assumes that you can login to root on the server using your ssh key but Solokit also supports running chef as a normal user (with some modifications to solo.rb).
 

data/lib/chef.rb

@@ -10,7 +10,7 @@ module Solokit
     def install
       return true if installed?
       puts "#{@name} (#{@env}): Installing chef..."
-      @ssh.run('export DEBIAN_FRONTEND=noninteractive; apt-get update && apt-get upgrade -y && apt-get install ruby ruby1.8-dev libopenssl-ruby wget rsync build-essential -y && wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz && tar xfz rubygems-1.3.7.tgz && cd rubygems-1.3.7 && ruby setup.rb && cd .. && rm -rf rubygems-1.3.7* && ln -s /usr/bin/gem1.8 /usr/bin/gem && gem install chef ohai --no-ri --no-rdoc')
+      @ssh.run('export DEBIAN_FRONTEND=noninteractive; apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confnew" && apt-get install -o Dpkg::Options::="--force-confnew" ruby ruby1.8-dev libopenssl-ruby wget rsync build-essential -y && wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz && tar xfz rubygems-1.3.7.tgz && cd rubygems-1.3.7 && ruby setup.rb && cd .. && rm -rf rubygems-1.3.7* && ln -s /usr/bin/gem1.8 /usr/bin/gem && gem install chef ohai --no-ri --no-rdoc')
     end
 
     def upload(root = "/")

data/lib/solokit/version.rb

@@ -1,3 +1,3 @@
 module Solokit
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solokit
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-26 00:00:00 +02:00
+date: 2011-08-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A toolkit for provisioning (ubuntu-)servers using chef-solo.