capistrano-cookbook 0.0.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24fea359d760de78d19d72b1a0af83d8148d8975
-  data.tar.gz: 08f245a70c063b265bb0cc46cee92ee029018315
+  metadata.gz: a8db1e37a1d94e2934595f8d547db0e7ad1cd387
+  data.tar.gz: 3c29f39cbe2f68e7656a3136ca701807efc67865
 SHA512:
-  metadata.gz: 101652399da7e307d8ed948f0c84760b626ffec8cc1ab0d804335a51edebebea0b1be7d7e5a3fb2cfa930c3aeef7acdb713329b268f8979eddd44441fd13959d
-  data.tar.gz: 8a4a88326f3bb089405304d960421bb3f058f7918ad1b8c0d14db63cd8d1e318dca37f2d691d751367c95f7c8827aaa5494e2cd6eb16c9344d0935a7039f9dd3
+  metadata.gz: 5c866dc7c97300bb1b7e880c827f85d2407844cf6721f796d7f381025e4edd39a3ecefedc97e68b90663d7c2a0630e120a5c78eeab6c566734102bc215ea59c0
+  data.tar.gz: 98cec165f29f8e0633aff07045c82ea3eef5fb0289746028e9807021dc591082ad8f006a601a5e3afc28145ab59a63724ee7cde589c2b5ab9d7f307b65c8a266

data/README.md

@@ -66,7 +66,8 @@ Add the following to `deploy.rb`
 
 Currently only works with Postgresql on configurations where your web server and db server are the same machine, e.g. single box deployments. This task will:
 
-* Check to see if a remote `database.yml` exists in `APP_PATH/shared/config`, if not attempt to copy one from `APP_PATH/shared/config`.
+* Check to see if a remote `database.yml` exists in `APP_PATH/shared/config`, if not attempt to copy one from `APP_PATH/shared/config`
+* If a new `database.yml` is created, it will include a username and database name based on the application name and a random password
 * Download the remote `database.yml`
 * Create the Postgres user specified in `database.yml` if it doesn't already exist
 * Create the Database specified in `database.yml` if it doesn't already exist

data/capistrano-cookbook.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'capistrano', '~> 3.1'
+  spec.add_dependency 'capistrano', '~>  3.2'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/capistrano/cookbook.rb

@@ -3,7 +3,6 @@ require "capistrano/cookbook/version"
 module Capistrano
   module Cookbook
     require 'capistrano/cookbook/check_revision'
-    require 'capistrano/cookbook/compile_assets_locally'
     require 'capistrano/cookbook/logs'
     require 'capistrano/cookbook/monit'
     require 'capistrano/cookbook/nginx'

data/lib/capistrano/cookbook/helpers/setup_config_values.rb

@@ -50,8 +50,9 @@ module Capistrano
           monit
           unicorn.rb
           unicorn_init.sh
+          secrets.yml
         )
       end
     end
   end
-end
+end

data/lib/capistrano/cookbook/tasks/compile_assets_locally.cap

@@ -8,6 +8,7 @@ namespace :deploy do
       run_locally do
         execute"rsync -av ./public/assets/ #{role.user}@#{role.hostname}:#{release_path}/public/assets/;"
       end
+      sudo "chmod -R 755 #{release_path}/public/assets/"
     end
     run_locally do
       execute "rm -rf ./public/assets"

data/lib/capistrano/cookbook/tasks/monit.cap

@@ -1,4 +1,5 @@
 namespace :monit do
+  
   %w(start stop restart).each do |task_name|
     desc "#{task_name} Monit"
     task task_name do
@@ -7,4 +8,12 @@ namespace :monit do
       end
     end
   end
-end
+  
+  desc "Reload Monit"
+  task 'reload' do
+    on roles(:app), in: :sequence, wait: 5 do
+      sudo "monit reload"
+    end
+  end
+  
+end

data/lib/capistrano/cookbook/tasks/restart.cap

@@ -7,4 +7,7 @@ namespace :deploy do
       end
     end
   end
-end
+end
+
+# Automatically restart after a deploy
+after 'deploy', 'deploy:restart'

data/lib/capistrano/cookbook/tasks/setup_config.cap

@@ -1,3 +1,4 @@
+require 'capistrano/dsl'
 require 'capistrano/cookbook/helpers/setup_config_values'
 require 'capistrano/cookbook/helpers/substitute_strings'
 require 'capistrano/cookbook/helpers/template'
@@ -11,7 +12,6 @@ namespace :deploy do
     on roles(:app) do
       # make the config dir
       execute :mkdir, "-p #{shared_path}/config"
-      full_app_name = fetch(:full_app_name)
 
       # config files to be uploaded to shared/config, see the
       # definition of smart_template for details of operation.
@@ -42,4 +42,4 @@ after 'deploy:setup_config', 'nginx:reload'
 
 # Restart monit so it will pick up any monit configurations
 # we've added
-after 'deploy:setup_config', 'monit:restart'
+after 'deploy:setup_config', 'monit:reload'

data/lib/capistrano/cookbook/templates/mongoid.example.yml.erb

@@ -5,7 +5,7 @@
     default:
       # Defines the name of the default database that Mongoid can connect to.
       # (required).
-      database: <%= "#{fetch(:applocation)}_#{fetch(:rails_env)}" %>
+      database: <%= "#{fetch(:application)}_#{fetch(:rails_env)}" %>
       # Provides the hosts the default session can connect to. Must be an array
       # of host:port pairs. (required)
       hosts:

data/lib/capistrano/cookbook/templates/monit.erb

@@ -1,7 +1,7 @@
 <% application = fetch(:application) %>
 set mail-format { subject: <%= "#{fetch(:full_app_name)} - #{fetch(:rails_env)}" %> $SERVICE $EVENT at $DATE }
 
-check process unicorn
+check process unicorn_<%=application%>
   with pidfile <%= current_path %>/tmp/pids/unicorn.pid
   start program = "/etc/init.d/unicorn_<%= application %>_<%= fetch(:rails_env)%> start"
   stop program = "/etc/init.d/unicorn_<%= application %>_<%= fetch(:rails_env)%> stop"
@@ -11,7 +11,7 @@ check process unicorn
   group unicorn
 
 <% (0..(fetch(:unicorn_worker_count) -1)).each do |worker| %>
-  check process unicorn_worker_<%= (5000 + worker).to_s %>
+  check process unicorn_<%= application %>_worker_<%= (5000 + worker).to_s %>
     with pidfile <%= current_path %>/tmp/pids/unicorn.<%= (5000 + worker).to_s %>.pid
     start program = "/bin/true"
     stop program = "/etc/init.d/unicorn_<%= application %>_<%= fetch(:rails_env)%> kill_worker <%= (5000 + worker).to_s %>"

data/lib/capistrano/cookbook/templates/nginx.conf.erb

@@ -3,9 +3,9 @@ upstream unicorn_<%= fetch(:full_app_name) %> {
 }
 
 server {
-  server_name <%= fetch(:server_name) %>;
   listen 80;
   root <%= fetch(:deploy_to) %>/current/public;
+  server_name <%= fetch(:server_name) %>;
 
   location ^~ /assets/ {
     gzip_static on;
@@ -13,8 +13,8 @@ server {
     add_header Cache-Control public;
   }
 
-  try_files $uri/index.html $uri @unicorn_<%= fetch(:full_app_name) %>;
-  location @unicorn_<%= fetch(:full_app_name) %> {
+  try_files $uri/index.html $uri @unicorn;
+  location @unicorn {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
@@ -28,9 +28,9 @@ server {
 
 <% if fetch(:enable_ssl) %>
 server {
-  server_name <%= fetch(:server_name) %>;
-  listen 443;
+  listen 443 default deferred;
   root <%= fetch(:deploy_to) %>/current/public;
+  server_name <%= fetch(:server_name) %>;
 
   location ^~ /assets/ {
     gzip_static on;
@@ -44,7 +44,7 @@ server {
     proxy_set_header   X-Forwarded-Proto https;
     proxy_set_header Host $http_host;
     proxy_redirect off;
-    proxy_pass http://unicorn;
+    proxy_pass http://unicorn_<%= fetch(:full_app_name) %>;
   }
 
   error_page 500 502 503 504 /500.html;
@@ -53,5 +53,5 @@ server {
   ssl on;
   ssl_certificate <%= fetch(:deploy_to) %>/shared/ssl_cert.crt;
   ssl_certificate_key <%= fetch(:deploy_to) %>/shared/ssl_private_key.key;
-}#
+}
 <% end %>

data/lib/capistrano/cookbook/templates/secrets.yml.erb

@@ -0,0 +1,2 @@
+<%= fetch(:rails_env) %>:
+  secret_key_base: <%= SecureRandom.hex(60) %>

data/lib/capistrano/cookbook/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Cookbook
-    VERSION = "0.0.5"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-cookbook
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Dixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ files:
 - lib/capistrano/cookbook/templates/mongoid.example.yml.erb
 - lib/capistrano/cookbook/templates/monit.erb
 - lib/capistrano/cookbook/templates/nginx.conf.erb
+- lib/capistrano/cookbook/templates/secrets.yml.erb
 - lib/capistrano/cookbook/templates/sidekiq.yml.erb
 - lib/capistrano/cookbook/templates/sidekiq_init.sh.erb
 - lib/capistrano/cookbook/templates/unicorn.rb.erb
@@ -125,4 +126,3 @@ specification_version: 4
 summary: Selection of Capistrano 3 tasks to reduce boilerplate required when deploying
   Rails and Sinatra applications
 test_files: []
-has_rdoc: