greenonline_capistrano_recipes 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3d10325309089e1561fb6aa15f37c78a1c22be4
-  data.tar.gz: fb7893c640faf27ba81e6d5a71608a2b4aa7d87e
+  metadata.gz: eaf67212490361b2cae173771f98e60629a4623f
+  data.tar.gz: a2259e85f5490ab03db095948feffca50b2f2734
 SHA512:
-  metadata.gz: 3ebda0948065e7f9f3330c14b56ce0f81ce87eb329150084d0b245e49623eba28193a1558f7646ac586419fefe2baf6b675e9900bffc15874ff321bbf82052cb
-  data.tar.gz: bbc3f25c99eabc001f8cc5fe8ac50129f97fa94fab02a7cf2c2557458b668aaf8d6d9e372a7ce3e65a47b545fa305ee0db9c6eb2e187a4736b12c9a05d0ac16e
+  metadata.gz: d96ecf68212798dd3b26e4b8b372e96d68046db46e5ec1ac31c68438531eba4fa7a49de284e11ea2e26f8acfaee82abc131b67842597dd45626a5bb5eda9e9f7
+  data.tar.gz: db3f4e8e3d27cd8c6d5d1ebaa4d1c594f0f38a8e2cb29be6e422ba4418efe454ac5753db72f3a85b9a5c69b723073b25acf51c577909796ebd640c4360c65a09

data/lib/greenonline/capistrano_recipes/version.rb

@@ -1,5 +1,5 @@
 module Greenonline
   module CapistranoRecipes
-    VERSION = "0.0.14"
+    VERSION = "0.0.15"
   end
 end

data/lib/greenonline/recipes/nginx.rb

@@ -11,7 +11,7 @@ module Capistrano
 
       desc "setup nginx for this application, adding it to sites-enabled"
       task :setup, roles: :web do
-        surun "ln -nfs #{File.join(current_path, '/config/nginx.conf')} /etc/nginx/conf.d/#{application.downcase}.conf"
+        surun "ln -nfs #{File.join(current_path, '/config/nginx.conf')} /etc/nginx/conf.d/#{application.downcase}_#{stage}.conf"
       end
       after "deploy:setup", "nginx:setup"
 

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

@@ -1,10 +1,10 @@
-upstream unicorn {
+upstream unicorn_<%= application.downcase %>_<%= stage %> {
   # fail_timeout=0 means we always retry an upstream even if it failed
   # to return a good HTTP response (in case the Unicorn master nukes a
   # single worker for timing out).
 
   # for UNIX domain socket setups:
-  server unix:/tmp/unicorn.<%= application.downcase %>.sock fail_timeout=0;
+  server unix:/tmp/unicorn.<%= application.downcase %>.<%= stage %>.sock fail_timeout=0;
 }
 
 server {
@@ -44,7 +44,7 @@ server {
     # redirects, we set the Host: header above already.
     proxy_redirect off;
 
-    proxy_pass http://unicorn;
+    proxy_pass http://unicorn_<%= application.downcase %>_<%= stage %>;
   }
 
   error_page 500 502 503 504 /500.html;

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

@@ -5,7 +5,7 @@ pid "<%= unicorn_pid %>"
 stderr_path "<%= unicorn_log %>"
 stdout_path "<%= unicorn_log %>"
 
-listen "/tmp/unicorn.<%= application.downcase %>.sock"
+listen "/tmp/unicorn.<%= application.downcase %>.<%= stage %>.sock"
 worker_processes <%= unicorn_workers %>
 timeout 30
 

data/lib/greenonline/recipes/unicorn.rb

@@ -20,9 +20,9 @@ module Capistrano
       task :setup, roles: :app do
         template "unicorn_init.erb", "/tmp/unicorn_init"
         run "chmod +x /tmp/unicorn_init"
-        surun "mv /tmp/unicorn_init /etc/init.d/unicorn_#{application.downcase}"
-        surun "chkconfig --add unicorn_#{application.downcase}"
-        surun "chkconfig unicorn_#{application.downcase} on"
+        surun "mv /tmp/unicorn_init /etc/init.d/unicorn_#{application.downcase}_#{stage}"
+        surun "chkconfig --add unicorn_#{application.downcase}_#{stage}"
+        surun "chkconfig unicorn_#{application.downcase}_#{stage} on"
       end
       after "deploy:setup", "unicorn:setup"
 
@@ -30,7 +30,7 @@ module Capistrano
         %w(start stop restart upgrade).each do |command|
           desc "#{command} unicorn"
           task command, roles: :web do
-            run "service unicorn_#{application.downcase} #{command}"
+            run "service unicorn_#{application.downcase}_#{stage} #{command}"
           end
         end
         after "deploy:restart", "unicorn:server:upgrade"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenonline_capistrano_recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Pieter Visser