solokit 0.0.2 → 0.0.3

data/cookbooks/upstream/users/metadata.json

@@ -0,0 +1,38 @@
+{
+  "replacing": {
+
+  },
+  "long_description": "",
+  "attributes": {
+
+  },
+  "maintainer": "37signals",
+  "recommendations": {
+
+  },
+  "license": "Apache v2.0",
+  "recipes": {
+    "users": ""
+  },
+  "maintainer_email": "sysadmins@37signals.com",
+  "suggestions": {
+
+  },
+  "dependencies": {
+
+  },
+  "conflicting": {
+
+  },
+  "platforms": {
+
+  },
+  "description": "Configures users and groups",
+  "version": "0.1.0",
+  "name": "users",
+  "providing": {
+    "users": [
+
+    ]
+  }
+}

data/cookbooks/upstream/users/metadata.rb

@@ -0,0 +1,4 @@
+maintainer        "37signals"
+maintainer_email  "sysadmins@37signals.com"
+description       "Configures users and groups"
+version           "0.1"

data/cookbooks/upstream/users/recipes/default.rb

@@ -0,0 +1,17 @@
+include_recipe "ruby-shadow"
+
+if node[:users]
+  node[:users].keys.each do |username|
+    config = node[:users][username]
+    user username do
+      comment config[:comment]
+      home "/home/#{username}"
+      shell "/bin/bash"
+      password config[:password]
+      supports :manage_home => true
+      action [:create, :manage]
+    end  
+    
+    add_keys username
+  end
+end

data/cookbooks/upstream/users/templates/default/authorized_keys.erb

@@ -0,0 +1,5 @@
+<% @keys.each do |name, key| %>
+# <%= name %>
+<%= key %>
+<% end %>
+

data/lib/chef.rb

@@ -14,15 +14,16 @@ module Solokit
     end
 
     def upload(root = "/")
+      solokit_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
       @ssh.run("rm -rf #{root}var/chef-solo", false) &&
-        @ssh.run("rm -rf #{root}etc/chef", false) &&
-        upload_files("cookbooks/upstream/", "#{root}var/chef-solo/upstream-cookbooks") &&
-        upload_files("cookbooks/site/", "#{root}var/chef-solo/site-cookbooks") &&
-        (File.exists?("envs/#{@env}/cookbooks") ? 
-         upload_files("envs/#{@env}/cookbooks/*", "#{root}var/chef-solo/site-cookbooks") :
-         true) &&
-           upload_files("chef/*", "#{root}etc/chef") &&
-           upload_files("envs/#{@env}/chef/", "#{root}etc/chef") 
+      @ssh.run("rm -rf #{root}etc/chef", false) &&
+      upload_files("#{solokit_path}/cookbooks/upstream/", "#{root}var/chef-solo/upstream-cookbooks") &&
+      upload_files("#{solokit_path}/cookbooks/site/", "#{root}var/chef-solo/site-cookbooks") &&
+      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("chef/*", "#{root}etc/chef") &&
+      upload_files("envs/#{@env}/chef/", "#{root}etc/chef") 
     end
 
     def run(debug = false, root = "/")
@@ -48,8 +49,8 @@ module Solokit
     end
 
     def upload_files(from, to)
-      @ssh.run("mkdir -p #{to}") &&
-        @ssh.rsync(from, to, true) 
+      return true unless File.exists?(from)
+      @ssh.run("mkdir -p #{to}") && @ssh.rsync(from, to, true) 
     end
 
     def installed?

data/lib/solokit/version.rb

@@ -1,3 +1,3 @@
 module Solokit
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solokit
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -63,8 +63,42 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENCE
-- README
+- README.markdown
 - Rakefile
+- chef/roles/base.json
+- chef/server.json
+- chef/solo.rb
+- cookbooks/site/users/definitions/add_keys.rb
+- cookbooks/site/users/recipes/default.rb
+- cookbooks/upstream/apt/files/default/apt-cacher
+- cookbooks/upstream/apt/files/default/apt-cacher.conf
+- cookbooks/upstream/apt/files/default/apt-proxy-v2.conf
+- cookbooks/upstream/apt/metadata.json
+- cookbooks/upstream/apt/metadata.rb
+- cookbooks/upstream/apt/recipes/cacher.rb
+- cookbooks/upstream/apt/recipes/default.rb
+- cookbooks/upstream/apt/recipes/proxy.rb
+- cookbooks/upstream/ruby-shadow/attributes/ruby-shadow.rb
+- cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/HISTORY
+- cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/MANIFEST
+- cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/README
+- cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/README.euc
+- cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/depend
+- cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/extconf.rb
+- cookbooks/upstream/ruby-shadow/files/default/shadow-1.4.1/shadow.c
+- cookbooks/upstream/ruby-shadow/recipes/default.rb
+- cookbooks/upstream/sudo/attributes/sudoers.rb
+- cookbooks/upstream/sudo/metadata.json
+- cookbooks/upstream/sudo/metadata.rb
+- cookbooks/upstream/sudo/recipes/default.rb
+- cookbooks/upstream/sudo/templates/default/sudoers.erb
+- cookbooks/upstream/users/attributes/default.rb
+- cookbooks/upstream/users/definitions/add_keys.rb
+- cookbooks/upstream/users/libraries/roles.rb
+- cookbooks/upstream/users/metadata.json
+- cookbooks/upstream/users/metadata.rb
+- cookbooks/upstream/users/recipes/default.rb
+- cookbooks/upstream/users/templates/default/authorized_keys.erb
 - lib/chef.rb
 - lib/configuration.rb
 - lib/solokit.rb

data/README

@@ -1 +0,0 @@
-Extracting out some code I use to provision servers with chef-solo. Only supports ubuntu.