deploify 0.2.9 → 0.2.10

data/lib/deploify/recipes/nginx.rb

@@ -7,7 +7,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :nginx_enabled_vhost_dir,     "/etc/nginx/sites-enabled"
   set :nginx_client_max_body_size,  "100M"
   set :nginx_vhost_type,            :http_only
-  set :nginx_vhost_listen_ip,       "0.0.0.0"
+  set :nginx_vhost_listen_ip,       nil
   set :nginx_upstream_servers,      []
   # secured sites stuff
   set :nginx_secured_site,          false
@@ -64,6 +64,13 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :config_project, :roles => :web do
         _deploify.push_configs(:nginx, project_config_files)
         if [:http_with_ssl, :http_force_ssl].include?(nginx_vhost_type)
+          set(:nginx_vhost_listen_ip) do
+            require "resolv"
+            server_ip = Resolv.getaddress(find_servers(roles: :web).first.host)
+            Capistrano::CLI.ui.ask "Enter IP for Nginx zone (needed for scenarios with SSL support) [#{server_ip}]" do |q|
+              q.default = server_ip
+            end
+          end
           # SSL is demanded, push certificates
           target_path = "#{deploy_to}/nginx/#{rails_env}"
           std.su_put(File.read("#{ssl_certs_source_dir}/#{rails_env}.crt"), "#{target_path}.crt", "/tmp", :mode => 0600)

data/lib/deploify/recipes/passenger.rb

@@ -104,10 +104,10 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       task :symlink_and_activate_passengerctl, :roles => :app do
         run "#{try_sudo} ln -sf #{deploy_to}/passenger/passengerctl /etc/init.d/passenger-#{application}"
-        if exists?(:stage) && fetch(:stage).eql?(:staging)
-          run "#{try_sudo} update-rc.d -f passenger-#{application} remove"
-        else
+        if app_server_autostart
           run "#{try_sudo} update-rc.d passenger-#{application} defaults"
+        else
+          run "#{try_sudo} update-rc.d -f passenger-#{application} remove"
         end
       end
 

data/lib/deploify/recipes/rails.rb

@@ -15,6 +15,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   set :rails_env, "production"
   set :shared_dirs, []  # Array of directories that should be created under shared/
                         # and linked to in the project
+  set(:app_server_autostart) do
+    # true if:
+    #   - stage not defined (non-multistaging scenario)
+    #   - stage is defined, but stage is not :staging
+    !exists?(:stage) || (exists?(:stage) && !fetch(:stage).eql?(:staging))
+  end
 
   # hook into the default capistrano deploy tasks
   before "deploy:setup", :except => { :no_release => true } do

data/lib/deploify/recipes/thin.rb

@@ -85,10 +85,10 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       task :symlink_and_activate_thinctl, :roles => :app do
         run "#{try_sudo} ln -sf #{deploy_to}/thin/thinctl /etc/init.d/thin-#{application}"
-        if exists?(:stage) && fetch(:stage).eql?(:staging)
-          run "#{try_sudo} update-rc.d -f thin-#{application} remove"
+        if app_server_autostart
+          run "#{try_sudo} update-rc.d passenger-#{application} defaults"
         else
-          run "#{try_sudo} update-rc.d thin-#{application} defaults"
+          run "#{try_sudo} update-rc.d -f passenger-#{application} remove"
         end
       end
 

data/lib/deploify/templates/nginx/vhost_http_force_ssl.conf.erb

@@ -9,7 +9,7 @@ server {
   server_name <%= domain %> <%= Array(web_server_aliases).join(' ') %>;
 
   location / {
-    rewrite ^ https://<%= domain %>$request_uri? permanent;
+    rewrite ^ https://<%= force_domain_with_www ? "www.#{domain}" : domain %>$request_uri? permanent;
   }
 }
 
@@ -25,18 +25,18 @@ server {
   ssl_certificate <%= deploy_to %>/nginx/<%= rails_env %>.crt;
   ssl_certificate_key <%= deploy_to %>/nginx/<%= rails_env %>.key;
 
-  <% if force_domain_with_www -%>
+  <%- if force_domain_with_www -%>
   if ($host !~* ^www.<%= domain %>$) {
     rewrite ^(.*) https://www.<%= domain %>$1 permanent;
   }
-  <% end -%>
+  <%- end -%>
 
   location / {
-    <% if nginx_secured_site -%>
+    <%- if nginx_secured_site -%>
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
-    <% end -%>
-    try_files $uri @upstream;
+    <%- end -%>
+    try_files $uri/index.html $uri @upstream;
   }
 
   location @upstream {
@@ -48,32 +48,31 @@ server {
     proxy_set_header X-Forwarded-Proto https;
   }
 
-  # This allows people to use images and css in their maintenance.html file
+  # this allows people to use images and css in their maintenance.html file
   if ($request_filename ~* \.(css|jpg|gif|png)$) {
     break;
   }
 
-  # Rewrite all the requests to the maintenance.html page if it exists.
+  # rewrite all the requests to the maintenance.html page if it exists
   if (-f $document_root/system/maintenance.html) {
     return 503;
   }
 
-  # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
+  # set Expire header on assets
   location ~ ^/(images|javascripts|stylesheets)/ {
-    expires max;
-    error_page 404 = @upstream;
+    if ($request_method = GET) {
+      expires 1y;
+    }
   }
-
   location ~ ^/assets/ {
-    expires max;
+    expires 1y;
     add_header Cache-Control public;
     add_header ETag "";
-    error_page 404 = @upstream;
+    break;
   }
 
   error_page 404 /404.html;
   error_page 500 502 504 /500.html;
-
   error_page 503 @503;
   location @503 {
     rewrite  ^(.*)$ /system/maintenance.html break;

data/lib/deploify/templates/nginx/vhost_http_only.conf.erb

@@ -5,25 +5,25 @@ upstream <%= nginx_upstream_name %> {
 }
 
 server {
-  listen <%= nginx_vhost_listen_ip %>:80;
+  listen <%= nginx_vhost_listen_ip %><%= ':' unless nginx_vhost_listen_ip.nil? %>80;
   server_name <%= domain %> <%= Array(web_server_aliases).join(' ') %>;
   root <%= deploy_to %>/current/public;
   client_max_body_size <%= nginx_client_max_body_size %>;
   access_log <%= shared_path %>/log/access.log;
   error_log <%= shared_path %>/log/error.log;
 
-  <% if force_domain_with_www -%>
+  <%- if force_domain_with_www -%>
   if ($host !~* ^www.<%= domain %>$) {
     rewrite ^(.*) http://www.<%= domain %>$1 permanent;
   }
-  <% end -%>
+  <%- end -%>
 
   location / {
-    <% if nginx_secured_site -%>
+    <%- if nginx_secured_site -%>
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
-    <% end -%>
-    try_files $uri @upstream;
+    <%- end -%>
+    try_files $uri/index.html $uri @upstream;
   }
 
   location @upstream {
@@ -35,32 +35,31 @@ server {
     proxy_set_header X-Forwarded-Proto http;
   }
 
-  # This allows people to use images and css in their maintenance.html file
+  # this allows people to use images and css in their maintenance.html file
   if ($request_filename ~* \.(css|jpg|gif|png)$) {
     break;
   }
 
-  # Rewrite all the requests to the maintenance.html page if it exists.
+  # rewrite all the requests to the maintenance.html page if it exists
   if (-f $document_root/system/maintenance.html) {
     return 503;
   }
 
-  # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
+  # set Expire header on assets
   location ~ ^/(images|javascripts|stylesheets)/ {
-    expires max;
-    error_page 404 = @upstream;
+    if ($request_method = GET) {
+      expires 1y;
+    }
   }
-
   location ~ ^/assets/ {
     expires max;
     add_header Cache-Control public;
     add_header ETag "";
-    error_page 404 = @upstream;
+    break;
   }
 
   error_page 404 /404.html;
   error_page 500 502 504 /500.html;
-
   error_page 503 @503;
   location @503 {
     rewrite  ^(.*)$ /system/maintenance.html break;

data/lib/deploify/templates/nginx/vhost_http_with_ssl.conf.erb

@@ -12,18 +12,18 @@ server {
   access_log <%= shared_path %>/log/access.log;
   error_log <%= shared_path %>/log/error.log;
 
-  <% if force_domain_with_www -%>
+  <%- if force_domain_with_www -%>
   if ($host !~* ^www.<%= domain %>$) {
     rewrite ^(.*) http://www.<%= domain %>$1 permanent;
   }
-  <% end -%>
+  <%- end -%>
 
   location / {
-    <% if nginx_secured_site -%>
+    <%- if nginx_secured_site -%>
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
-    <% end -%>
-    try_files $uri @upstream;
+    <%- end -%>
+    try_files $uri/index.html $uri @upstream;
   }
 
   location @upstream {
@@ -35,32 +35,31 @@ server {
     proxy_set_header X-Forwarded-Proto http;
   }
 
-  # This allows people to use images and css in their maintenance.html file
+  # this allows people to use images and css in their maintenance.html file
   if ($request_filename ~* \.(css|jpg|gif|png)$) {
     break;
   }
 
-  # Rewrite all the requests to the maintenance.html page if it exists.
+  # rewrite all the requests to the maintenance.html page if it exists
   if (-f $document_root/system/maintenance.html) {
     return 503;
   }
 
-  # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
+  # set Expire header on assets
   location ~ ^/(images|javascripts|stylesheets)/ {
-    expires max;
-    error_page 404 = @upstream;
+    if ($request_method = GET) {
+      expires 1y;
+    }
   }
-
   location ~ ^/assets/ {
     expires max;
     add_header Cache-Control public;
     add_header ETag "";
-    error_page 404 = @upstream;
+    break;
   }
 
   error_page 404 /404.html;
   error_page 500 502 504 /500.html;
-
   error_page 503 @503;
   location @503 {
     rewrite  ^(.*)$ /system/maintenance.html break;
@@ -79,17 +78,17 @@ server {
   ssl_certificate <%= deploy_to %>/nginx/<%= rails_env %>.crt;
   ssl_certificate_key <%= deploy_to %>/nginx/<%= rails_env %>.key;
 
-  <% if force_domain_with_www -%>
+  <%- if force_domain_with_www -%>
   if ($host !~* ^www.<%= domain %>$) {
     rewrite ^(.*) https://www.<%= domain %>$1 permanent;
   }
-  <% end -%>
+  <%- end -%>
 
   location / {
-    <% if nginx_secured_site -%>
+    <%- if nginx_secured_site -%>
     auth_basic "Limited access";
     auth_basic_user_file <%= "#{deploy_to}/nginx/.htaccess" %>;
-    <% end -%>
+    <%- end -%>
     try_files $uri @upstream;
   }
 
@@ -102,32 +101,31 @@ server {
     proxy_set_header X-Forwarded-Proto https;
   }
 
-  # This allows people to use images and css in their maintenance.html file
+  # this allows people to use images and css in their maintenance.html file
   if ($request_filename ~* \.(css|jpg|gif|png)$) {
     break;
   }
 
-  # Rewrite all the requests to the maintenance.html page if it exists.
+  # rewrite all the requests to the maintenance.html page if it exists
   if (-f $document_root/system/maintenance.html) {
     return 503;
   }
 
-  # set Expire header on assets: see http://developer.yahoo.com/performance/rules.html#expires
+  # set Expire header on assets
   location ~ ^/(images|javascripts|stylesheets)/ {
-    expires max;
-    error_page 404 = @upstream;
+    if ($request_method = GET) {
+      expires 1y;
+    }
   }
-
   location ~ ^/assets/ {
     expires max;
     add_header Cache-Control public;
     add_header ETag "";
-    error_page 404 = @upstream;
+    break;
   }
 
   error_page 404 /404.html;
   error_page 500 502 504 /500.html;
-
   error_page 503 @503;
   location @503 {
     rewrite  ^(.*)$ /system/maintenance.html break;

data/lib/deploify/version.rb

@@ -1,7 +1,7 @@
 module Deploify
   MAJOR = 0
   MINOR = 2
-  PATCH = 9
+  PATCH = 10
   BUILD = nil
 
   if BUILD.nil?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deploify
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Richard Riman