dark-capistrano-recipes 0.6.8 → 0.6.9

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 8
-:major: 0
-:build: 
 :minor: 6
+:build: 
+:patch: 9
+:major: 0

data/dark-capistrano-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dark-capistrano-recipes}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Misiowiec", "Leonardo Bighetti"]
-  s.date = %q{2010-09-23}
+  s.date = %q{2010-10-01}
   s.description = %q{Extend the Capistrano gem with these useful recipes}
   s.email = %q{leonardobighetti@gmail.com}
   s.extra_rdoc_files = [

data/generators/nginx.conf.erb

@@ -1,10 +1,15 @@
+    <% if is_using_unicorn %>
     upstream <%= application %>_app_server {
         server unix:<%= unicorn_socket %> fail_timeout=0;
     }
+    <% end %>
     # <%= application %> Server
     server {
         listen <%= application_port %>;
-
+        <% if is_using_passenger %>
+        rails_env <%= rails_env %>;
+        passenger_enabled on;
+        <% end %>
         client_max_body_size 500M;
         server_name <%= application %>;
 
@@ -71,15 +76,20 @@
         }
     }
     <% if application_uses_ssl %>
+    <% if is_using_unicorn %>
     upstream <%= application %>_app_ssl {
         server unix:<%= unicorn_socket %> fail_timeout=0;
     }  
+    <% end %>
     # This server is setup for ssl. Uncomment if 
     # you are using ssl as well as port 80.
     server {
       listen <%= application_port_ssl%>;
       server_name <%= application %>;
-
+      <% if is_using_passenger %>
+      rails_env <%= rails_env %>;
+      passenger_enabled on;
+      <% end %>
       ssl                     on;
       ssl_certificate         /etc/ssl/certs/server.crt;
       ssl_certificate_key     /etc/ssl/private/server.key;

data/lib/helpers.rb

@@ -20,6 +20,10 @@ def is_using_nginx
   is_using('nginx',:web_server)
 end
 
+def is_using_passenger
+  is_using('passenger',:server)
+end
+
 def is_using_unicorn
   is_using('unicorn',:server)
 end

data/lib/recipes/god.rb

@@ -14,7 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     _cset(:bin_god) { defined?(:rvm_ruby_string) ? 'bootup_god' : 'god' }
-    _cset(:server_name)    { "#{application}-unicorn" }
+    _cset(:server_name)    { "#{application}-#{server}" }
     _cset(:god_init_local) { "#{docs_path}/god/god.init" }
     _cset :god_init_temp,   '/tmp/god.init'
     _cset :god_init_remote, '/etc/init.d/god'
@@ -110,5 +110,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       sudo "#{bin_god} status"
     end
   end
-  after 'deploy:setup', 'god:setup' if is_using_god
+  after 'deploy:setup' do
+    god.setup if is_using_god && Capistrano::CLI.ui.agree("Create app.god in app's shared path? [Yn]")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dark-capistrano-recipes
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 9
+  version: 0.6.9
 platform: ruby
 authors: 
 - Phil Misiowiec
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -03:00
+date: 2010-10-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency