solokit 0.0.4.1 → 0.0.5

data/README.markdown

@@ -25,5 +25,50 @@ For each layer, Solokit looks for a directory structure like this:
 Usage
 ---
 
-TBD
+Create the basic directory structure:
+
+    mkdir project
+    cd project
+    mkdir -p envs/test/chef/roles
+    
+
+Add something like this to a Rakefile:
+
+    require 'rubygems'
+    require 'solokit'
+    
+    namespace :test do
+      desc "Update system configuration"
+      task :provision do
+        Solokit::UserJsonGenerator.generate! "test"
+        Solokit::Chef.provision!("test", "test.example.com", Solokit::Configuration.new("test"))
+      end
+    end
+
+Add user configuration to users.yml (optional, but you need to provide a chef/roles/base.json without the users role if you skip this step):
+
+    # User data used to setup user accounts using chef.
+    # The hash is generated with "openssl passwd -1".
+    
+    # Random PWgen password
+    default_hash: $1$8jLGWmPB$yFGmUThzbL0DMarc1CIY1/
+    
+    groups:
+      developers: user
+    
+    users:
+      user:
+        hash: $1$8jLGWmPB$yFGmUThzbL0DMarc1CIY1/
+        keys: jocke@keymaker
+    
+      ## -- Shared users --
+      deploy:
+        keys: group/developers 
+     
+    envs:
+      test:
+        users: group/developers deploy
+        sudo: group/developers
+    
+By default this setup assumes that you can login to root on the server using your ssh key.
 

data/lib/chef.rb

@@ -22,7 +22,7 @@ module Solokit
       upload_files("cookbooks/upstream/*", "#{root}var/chef-solo/upstream-cookbooks") &&
       upload_files("cookbooks/site/*", "#{root}var/chef-solo/site-cookbooks") &&
       upload_files("envs/#{@env}/cookbooks/*", "#{root}var/chef-solo/site-cookbooks") &&
-      upload_files("#{solokit_path}/chef*", "#{root}etc/chef") &&
+      upload_files("#{solokit_path}/chef/*", "#{root}etc/chef") &&
       upload_files("chef/*", "#{root}etc/chef") &&
       upload_files("envs/#{@env}/chef/*", "#{root}etc/chef") 
     end

data/lib/configuration.rb

@@ -3,7 +3,10 @@ require 'ostruct'
 module Solokit
   class Configuration < OpenStruct
     def initialize(*envs)
-      shared_config = YAML.load_file("config.yml")
+      shared_config = { "debug_ssh" => false, "debug_chef" => false }
+      if File.exists?("config.yml")
+        shared_config = YAML.load_file("config.yml").merge(shared_config)
+      end
 
       config = shared_config
       envs.each do |env|

data/lib/solokit/version.rb

@@ -1,3 +1,3 @@
 module Solokit
-  VERSION = "0.0.4.1"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solokit
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  - 1
-  version: 0.0.4.1
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"