capistrano-devops 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc29117069157ffb1037420ffca03faf6a9c2be
-  data.tar.gz: c3bf2166efb877a9effe7f85a4161bfd8c138796
+  metadata.gz: 9a0eadccd1218e6ed7f72541ca61d917c0dce403
+  data.tar.gz: 831043ac33f0baa88a7de833fa2add8429cf6e0c
 SHA512:
-  metadata.gz: f5ceec8875da0cf59e3a904e4a21c2bf1927ec28a5607a21d574dac5372c5560f8401c482884066561a8c1338e252c38e34cc0473884d20f7d84cb95d64b8e81
-  data.tar.gz: fc6dfb5812cc3960a7ee64c4df8a681cb463801e1e683706f8dc7d9c136cb4735290b2521d8b0d4a6c87d64005f2688feee425b0e8982ebe4b351d38ffcf8833
+  metadata.gz: 67c90af6d4665f20d59eea027f34fe92b1892885eab3894fc2d8e46d6091e012a6bd2e235e031c071985beb73bfaa3ca18f2f854ec325586e5857a7e7914f144
+  data.tar.gz: 797006d8db0f9d3298bac357fd958436fc2c1253629aeebcc44391a2a7f0c1e43080a58f0dc7e1a4f84e8b5a2d2e6062f1560551292e69e1af41bbde5ad92f4b

data/lib/capistrano/devops/templates/nginx_unicorn.erb

@@ -6,12 +6,6 @@ server {
   server_name <%= fetch(:server_name) %>;
   listen 80 default deferred;
 
-  if (<%= fetch(:unicorn_force_ssl) %> = "true") {
-    if ($http_x_forwarded_proto = "http") {
-      return 301 https://$host$request_uri;
-    }
-  }
-
   root <%= current_path %>/public;
 
   location ^~ /assets/ {
@@ -33,35 +27,3 @@ server {
   client_max_body_size 4G;
   keepalive_timeout 10;
 }
-
-if (<%= fetch(:unicorn_force_ssl) %> = "true") {
-  server {
-    server_name <%= fetch(:server_name) %>;
-    listen 443;
-
-    ssl on;
-    ssl_certificate /etc/ssl/certs/<%= fetch(:server_name) %>.crt;
-    ssl_certificate_key /etc/ssl/private/server.key;
-
-    root <%= current_path %>/public;
-
-    location ^~ /assets/ {
-      gzip_static on;
-      expires max;
-      add_header Cache-Control public;
-    }
-
-    try_files $uri/index.html $uri @unicorn;
-    location @backend_<%= fetch(:application) %> {
-      proxy_set_header X-Forwarded-For  $proxy_add_x_forwarded_for;
-      proxy_set_header Host             $http_host;
-      proxy_set_header X-Real-IP        $remote_addr;
-      proxy_redirect off;
-      proxy_pass http://backend_<%= fetch(:application) %>;
-    }
-
-    error_page 500 502 503 504 /500.html;
-    client_max_body_size 4G;
-    keepalive_timeout 10;
-  }
-}

data/lib/capistrano/devops/templates/nginx_unicorn_ssl.erb

@@ -0,0 +1,63 @@
+upstream backend_<%= fetch(:application) %> {
+  server unix:/tmp/unicorn.<%= fetch(:application) %>.sock fail_timeout=0;
+}
+
+server {
+  server_name <%= fetch(:server_name) %>;
+  listen 80 default deferred;
+
+  if ($http_x_forwarded_proto = "http") {
+    return 301 https://$host$request_uri;
+  }
+
+  root <%= current_path %>/public;
+
+  location ^~ /assets/ {
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+  }
+
+  try_files $uri/index.html $uri @backend_<%= fetch(:application) %>;
+  location @backend_<%= fetch(:application) %> {
+    proxy_set_header X-Forwarded-For  $proxy_add_x_forwarded_for;
+    proxy_set_header Host             $http_host;
+    proxy_set_header X-Real-IP        $remote_addr;
+    proxy_redirect off;
+    proxy_pass http://backend_<%= fetch(:application) %>;
+  }
+
+  error_page 500 502 503 504 /500.html;
+  client_max_body_size 4G;
+  keepalive_timeout 10;
+}
+
+server {
+  server_name <%= fetch(:server_name) %>;
+  listen 443;
+
+  ssl on;
+  ssl_certificate /etc/ssl/certs/<%= fetch(:server_name) %>.crt;
+  ssl_certificate_key /etc/ssl/private/server.key;
+
+  root <%= current_path %>/public;
+
+  location ^~ /assets/ {
+    gzip_static on;
+    expires max;
+    add_header Cache-Control public;
+  }
+
+  try_files $uri/index.html $uri @unicorn;
+  location @backend_<%= fetch(:application) %> {
+    proxy_set_header X-Forwarded-For  $proxy_add_x_forwarded_for;
+    proxy_set_header Host             $http_host;
+    proxy_set_header X-Real-IP        $remote_addr;
+    proxy_redirect off;
+    proxy_pass http://backend_<%= fetch(:application) %>;
+  }
+
+  error_page 500 502 503 504 /500.html;
+  client_max_body_size 4G;
+  keepalive_timeout 10;
+}

data/lib/capistrano/devops/templates/unicorn.erb

@@ -6,3 +6,19 @@ stdout_path "<%= fetch(:unicorn_log) %>"
 listen "/tmp/unicorn.<%= fetch(:application) %>.sock"
 worker_processes <%= fetch(:unicorn_workers) %>
 timeout <%= fetch(:unicorn_timeout) %>
+
+preload_app true
+
+before_fork do |server, worker|
+  # Disconnect since the database connection will not carry over
+  if defined? ActiveRecord::Base
+    ActiveRecord::Base.connection.disconnect!
+  end
+end
+
+after_fork do |server, worker|
+  # Start up the database connection again in the worker
+  if defined?(ActiveRecord::Base)
+    ActiveRecord::Base.establish_connection
+  end
+end

data/lib/capistrano/devops/templates/unicorn_init.erb

@@ -5,7 +5,7 @@ set -e
 TIMEOUT=${TIMEOUT-60}
 APP_ROOT=<%= current_path %>
 PID=<%= fetch(:unicorn_pid) %>
-CMD="cd <%= current_path %>; bundle exec unicorn -D -c <%= fetch(:unicorn_config) -E <%= fetch(:rails_env, 'production') %>"
+CMD="cd <%= current_path %>; bundle exec unicorn -D -c <%= fetch(:unicorn_config) %> -E <%= fetch(:rails_env, 'production') %>"
 AS_USER=<%= fetch(:unicorn_user) %>
 set -u
 

data/lib/capistrano/devops/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Devops
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -37,4 +37,23 @@ namespace :nginx do
       after 'nginx:rainbows:setup', 'nginx:restart'
     end
   end
+
+  namespace :unicorn do
+    desc "Setup nginx configuration for this application (unicorn)"
+    task :setup do
+      on roles :web do
+        if fetch(:unicorn_force_ssl) == true
+          template "nginx_unicorn_ssl.erb", "/tmp/nginx_conf"
+        else
+          template "nginx_unicorn.erb", "/tmp/nginx_conf"
+        end
+
+        as :root do
+          execute :mv, "/tmp/nginx_conf /etc/nginx/sites-enabled/#{fetch(:application)}"
+          execute :rm, "-f /etc/nginx/sites-enabled/default"
+        end
+      end
+      after 'nginx:unicorn:setup', 'nginx:restart'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-devops
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - tristan
@@ -14,28 +14,28 @@ dependencies:
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: yay
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -62,6 +62,7 @@ files:
 - lib/capistrano/devops/ssh.rb
 - lib/capistrano/devops/templates/nginx_rainbows.erb
 - lib/capistrano/devops/templates/nginx_unicorn.erb
+- lib/capistrano/devops/templates/nginx_unicorn_ssl.erb
 - lib/capistrano/devops/templates/rainbows.erb
 - lib/capistrano/devops/templates/rainbows_init.erb
 - lib/capistrano/devops/templates/unicorn.erb
@@ -145,18 +146,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: yay
 test_files: []
+has_rdoc: