Added app-1, 2

README.md

@@ -73,3 +73,5 @@ Then provision it:
 ```sh
 $ knife solo cook ec2-user@app-1.us-west-1 -i ~/.ssh/prepan.pem
 ```
+
+From the 2nd time, you have to use `deployer` user 

config/deploy.pl

@@ -0,0 +1,33 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use Cinnamon::DSL;
+
+role local => [qw(local.prepan.org)], {
+    user => 'vagrant',
+};
+
+role redis => [qw(redis-1.us-west-1)], {
+    user => 'ec2-user',
+};
+
+role app   => [qw(app-1.us-west-1 app-2.us-west-1)], {
+    user => 'ec2-user',
+};
+
+task chef => {
+    prepare => sub {
+        my ($host, @args) = @_;
+        my $user = get('user');
+
+        run "knife", "solo", "prepare", "$user\@$host", "-c", "config/knife.rb", "-i", "~/.ssh/prepan.pem", "-F", "~/.ssh/config"
+    },
+
+    cook => sub {
+        my ($host, @args) = @_;
+        my $user = get('user');
+
+        run "knife", "solo", "cook", "$user\@$host", "-c", "config/knife.rb", "-i", "~/.ssh/prepan.pem", "-F", "~/.ssh/config"
+    },
+};

nodes/app-1.us-west-1.json

@@ -0,0 +1,15 @@
+{
+    "run_list": [
+        "role[app]"
+    ],
+
+    "app": {
+        "domain": "prepan.org"
+    },
+
+    "authorization":  {
+        "sudo": {
+            "users": ["ec2-user", "deployer"]
+        }
+    }
+}

nodes/app-2.us-west-1.json

@@ -0,0 +1,15 @@
+{
+    "run_list": [
+        "role[app]"
+    ],
+
+    "app": {
+        "domain": "prepan.org"
+    },
+
+    "authorization":  {
+        "sudo": {
+            "users": ["ec2-user", "deployer"]
+        }
+    }
+}

roles/base.rb

@@ -1,6 +1,7 @@
 name "base"
 run_list %w(
   recipe[base]
+  recipe[build-essential]
 )
 
 default_attributes(

roles/db.rb

@@ -1,5 +1,6 @@
 name "db"
 run_list %w(
+  role[base]
   recipe[mysql::server]
 )
 

roles/redis.rb

@@ -1,6 +1,6 @@
 name "redis"
 run_list %w(
-  recipe[build-essential]
+  role[base]
   recipe[redis::source]
 )
 

site-cookbooks/daemontools/recipes/directories.rb

@@ -1,3 +1,10 @@
+directory "/service" do
+  action :create
+  owner  'root'
+  group  'root'
+  mode   0755
+end
+
 node.app.services.each do |name|
   directory "/service/#{name}" do
     action :create

site-cookbooks/daemontools/recipes/install.rb

@@ -17,5 +17,5 @@
 initctl reload-configuration
 initctl start svscan
 COMMAND
-  not_if { system("initctl status svscan") }
+  only_if { `initctl status svscan`.match(/stop/) }
 end

site-cookbooks/perl/recipes/cpan.rb

@@ -1,24 +1,16 @@
-package "perl-CPAN" do
-  notifies :run, "execute[install cpanm]"
-  not_if { system('which cpan') }
-end
-
 execute "install cpanm" do
-  command "cpan App::cpanminus"
-  notifies :run, "execute[install modules]"
+  command "curl -L http://cpanmin.us | perl - --self-upgrade"
   not_if { system('which cpanm') }
 end
 
-execute "install modules" do
-  [
-    'Module::Install',
-    'Module::Install::CPANfile',
-    'Module::Install::ReadmeFromPod',
-    'Module::Install::Repository',
-    'git://github.com/miyagawa/carton.git',
-  ].each do |name|
-    command "cpanm #{name}"
+[
+  'Module::Install',
+  'Module::Install::CPANfile',
+  'Module::Install::ReadmeFromPod',
+  'Module::Install::Repository',
+  'git://github.com/miyagawa/carton.git',
+].each do |name|
+  execute "install #{name}" do
+    command "cpanm -n -f #{name}"
   end
-
-  not_if { system('which carton') }
 end

site-cookbooks/perl/recipes/perl.rb

@@ -1,3 +1,3 @@
 package "perl" do
-  notifies :run, "package[perl-CPAN]"
+  notifies :run, "execute[install cpanm]"
 end