greenonline_capistrano_recipes 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434edc795057d242b372a35d090b29df5f080751
-  data.tar.gz: 01f99b233b87bffb0485f825c7f8f238159bc7b9
+  metadata.gz: fc06dc50871c7fa243d970197926fa3d5ac8037d
+  data.tar.gz: 9def24afcf5b8393f9df18cbb34df0a7e32aa546
 SHA512:
-  metadata.gz: bb40c37ff00534647f919b5ebbc78588be87fefaa804b511176469bbc53dfa77d73eb47ea1617769ec97ec02741dc8939f72a8b873ca7f7a7bb944f6db27896b
-  data.tar.gz: cf51f6e80ed3228e06a410c04d8f4590c0f1a841ef9179402376500dde49d36cced86f983c8dc06179fa6b7b084e72a4c0e19810e41315b4a55bee72351c0a17
+  metadata.gz: 2864957e512235f7a62d08fd112d52ca724e46b92e20d0196c1aa0a77122724038be3a7923bea6090814c9b67e532f60e692e383c3c995e672ebac7627fb008e
+  data.tar.gz: 353c46b12cea3741c15df53dcea7af8bb0a58862cf1732517a756a369d113c6f0d5e31a912fef2303e341e6a11c47c43483f0b57adfcae3bb3085f15aeaf4108

data/lib/greenonline/capistrano_recipes/version.rb

@@ -1,5 +1,5 @@
 module Greenonline
   module CapistranoRecipes
-    VERSION = "0.0.16"
+    VERSION = "0.0.17"
   end
 end

data/lib/greenonline/recipes/nginx.rb

@@ -1,6 +1,10 @@
 module Capistrano
   Configuration.instance(true).load do
     set_default(:nginx_server_name, nil)
+    set_default(:nginx_ssl_enabled, false)
+    set_default(:nginx_ssl_path, '/etc/ssl/')
+    set_default(:nginx_ssl_key, nil)
+    set_default(:nginx_ssl_certificate, nil)
 
     namespace :nginx do
       desc "update latest nginx configuration"

data/lib/greenonline/recipes/templates/nginx_unicorn.erb

@@ -50,4 +50,57 @@ server {
   error_page 500 502 503 504 /500.html;
   client_max_body_size 4G;
   keepalive_timeout 10;
-}
+}
+
+<% if nginx_ssl_enabled %>
+server {
+  listen 443;
+
+  ssl on;
+  ssl_certificate <%= nginx_ssl_path %><%= nginx_ssl_certificate %>;
+  ssl_certificate_key <%= nginx_ssl_path %><%= nginx_ssl_key %>;
+
+  <% if nginx_server_name %>
+  server_name <%= nginx_server_name %>;
+  <% end  %>
+  root <%= current_path %>/public;
+
+  location ^~ /assets/ {
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+  }
+
+  if (-f $document_root/maintenance.html) {
+    rewrite  ^(.*)$  /maintenance.html last;
+    break;
+  }
+
+  try_files $uri/index.html $uri @unicorn;
+
+  location @unicorn {
+    proxy_set_header   X-Forwarded-Proto https;
+    # an HTTP header important enough to have its own Wikipedia entry:
+    # http://en.wikipedia.org/wiki/X-Forwarded-For
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+    # enable this if you forward HTTPS traffic to unicorn,
+    # this helps Rack set the proper URL scheme for doing redirects:
+    # proxy_set_header X-Forwarded-Proto $scheme;
+
+    # pass the Host: header from the client right along so redirects
+    # can be set properly within the Rack application
+    proxy_set_header Host $http_host;
+
+    # we don't want nginx trying to do something clever with
+    # redirects, we set the Host: header above already.
+    proxy_redirect off;
+
+    proxy_pass http://unicorn_<%= application.downcase %>_<%= stage %>;
+  }
+
+  error_page 500 502 503 504 /500.html;
+  client_max_body_size 4G;
+  keepalive_timeout 10;
+}
+<% end %>

data/lib/greenonline/recipes/templates/unicorn.rb.erb

@@ -29,8 +29,8 @@ before_fork do |server, worker|
   # we send it a QUIT.
   #
   # Using this method we get 0 downtime deploys.
- 
-  old_pid = File.join RAILS_ROOT, '<%= unicorn_pid %>.oldbin'
+
+  old_pid = '<%= unicorn_pid %>.oldbin'
   if File.exists?(old_pid) && server.pid != old_pid
     begin
       Process.kill("QUIT", File.read(old_pid).to_i)

data/lib/greenonline/recipes/templates/unicorn_init.erb

@@ -20,14 +20,16 @@ CMD="<%= current_path %>/bin/unicorn -D -c <%= unicorn_config %> -E <%= stage %>
 AS_USER=<%= unicorn_user %>
 set -u
 
-OLD_PIN="$PID.oldbin"
+OLD_PID="$PID.oldbin"
+
+cd $APP_ROOT || exit 1
 
 sig () {
   test -s "$PID" && kill -$1 `cat $PID`
 }
 
 oldsig () {
-  test -s $OLD_PIN && kill -$1 `cat $OLD_PIN`
+  test -s $OLD_PID && kill -$1 `cat $OLD_PID`
 }
 
 run () {
@@ -38,44 +40,89 @@ run () {
   fi
 }
 
+workersig () {
+  workerpid="<%= current_path %>/tmp/pids/unicorn.worker.$2.pid"
+  test -s "$workerpid" && kill -$1 `cat $workerpid`
+}
+
 case "$1" in
 start)
-  sig 0 && echo >&2 "Already running" && exit 0
+  sig 0 && echo >&2 "Start failed: Unicorn already running! Exiting!" && exit 0
+  echo "Starting: "
   run "$CMD"
   ;;
 stop)
   sig QUIT && exit 0
-  echo >&2 "Not running"
+  echo >&2 "Stop failed: Unicorn isn't running."
   ;;
 force-stop)
   sig TERM && exit 0
-  echo >&2 "Not running"
+  echo >&2 "Force-stop failed: Unicorn isn't running"
   ;;
 restart|reload)
   sig HUP && echo reloaded OK && exit 0
-  echo >&2 "Couldn't reload, starting '$CMD' instead"
+  echo >&2 "Reload failed: executing '$CMD' "
   run "$CMD"
   ;;
 upgrade)
-  if sig USR2 && sleep 2 && sig 0 && oldsig QUIT
+  if test -s $PID; then ORIG_PID=`cat $PID`; else ORIG_PID=0; fi
+
+  echo 'Original PID: ' $ORIG_PID
+
+  if sig USR2
   then
+    echo 'USR2 sent; Waiting for .oldbin'
     n=$TIMEOUT
-    while test -s $OLD_PIN && test $n -ge 0
+
+    #wait for .oldpid to be written
+    while (!(test -s $OLD_PID) && test $n -ge 0)
+    do
+      printf '.' && sleep 1 && n=$(( $n - 1 ))
+    done
+
+    echo 'Waiting for new pid file'
+    #when this loop finishes, should have new pid file
+    while (!(test -s $PID ) || test -s $OLD_PID) && test $n -ge 0
     do
       printf '.' && sleep 1 && n=$(( $n - 1 ))
     done
-    echo
 
-    if test $n -lt 0 && test -s $OLD_PIN
+    if test -s $PID
     then
-      echo >&2 "$OLD_PIN still exists after $TIMEOUT seconds"
+      NEW_PID=`cat $PID`
+    else
+      echo 'New master failed to start; see error log'
       exit 1
     fi
+
+    #timeout has elapsed, verify new pid file exists
+    if [ $ORIG_PID -eq $NEW_PID ]
+    then
+      echo
+      echo >&2 'New master failed to start; see error log'
+      exit 1
+    fi
+
+    echo 'New PID: ' $NEW_PID
+
+    #verify old master QUIT
+    echo
+    if test -s $OLD_PID
+    then
+      echo >&2 "$OLD_PID still exists after $TIMEOUT seconds"
+      exit 1
+    fi
+
+    printf 'Unicorn successfully upgraded'
     exit 0
   fi
-  echo >&2 "Couldn't upgrade, starting '$CMD' instead"
+  echo >&2 "Upgrade failed: executing '$CMD' "
   run "$CMD"
   ;;
+kill_worker)
+  workersig QUIT $2 && exit 0
+  echo >&2 "Kill Worker failed: worker not running"
+  ;;
 reopen-logs)
   sig USR1
   ;;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: greenonline_capistrano_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Pieter Visser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler