capistrano_misc_recipes 0.1.0 → 0.2.0

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 *.swp
+*.swo

data/README.md

@@ -109,9 +109,11 @@ end
 
 `passenger.start`, `passenger.stop` and `passenger.restart` tasks can be used.
 
-### Generate sample nginx config for application
+### Generate sample configs for god and nginx
 
-Task `cap passenger:nginx_config` prints sample nginx config and saves it in file application tmp dir
+Task `cap passenger:config:god` generates sample _god_ config and stores it in application tmp dir
+
+Task `cap passenger:config:nginx` generates sample _nginx_ config and stores it in file application tmp dir
 
 ## Contributing
 

data/lib/capistrano_misc_recipes/passenger.rb

@@ -15,9 +15,9 @@ module Capistrano
         _cset :passenger_port,        3000
         _cset :passenger_use_socket,  false
 
-
-        desc '[internal] Start passenger'
-        task :start, roles: :app do
+        # command to start passenger
+        def start_command
+          # TODO try_sudo
 
           command = []
           command << "cd #{current_path}"
@@ -37,62 +37,54 @@ module Capistrano
           command << "--pid-file #{passenger_pid_file}"
           command << "--environment #{rails_env}"
           command << "--daemonize"
-          run command.join ' '
+          command.join ' '
+        end
 
+        def stop_command
+          # TODO try_sudo
+          "cd #{current_path} && #{bundlify 'passenger'} stop --pid-file #{passenger_pid_file} ; true"
+        end
+
+        def restart_command
+          "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
+        end
+
+        desc '[internal] Start passenger'
+        task :start, roles: :app do
+          run start_command
         end
 
         desc '[internal] Stop passenger'
         task :stop, roles: :app do
-          run "cd #{current_path} && #{bundlify 'passenger'} stop --pid-file #{passenger_pid_file} ; true"
+          run stop_command
         end
 
         desc '[internal] Restart passenger'
         task :restart, roles: :app, except: { no_release: true } do
-          run "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
+          run restart_command
         end
 
-        desc 'generates nginx virtual host template file'
-        task :nginx_config do
-
-          proxy_pass = if passenger_use_socket
-                         "http://unix:#{passenger_socket_file}"
-                       else
-                         "http://#{passenger_address}:#{passenger_port}"
-                       end
-
-          conf_file = <<CONF
+        namespace :config do
 
-# nginx virtual host file for
-#    application: #{application}
-#{exists?(:stages) ? "#    stage: #{stage}\n" : nil}
-server {
-    listen 80;
-    server_name #{application}
-    root #{File.join current_path, 'public'};
-    client_max_body_size 15M;
+          {
+            god: { extension: 'god' },
+            nginx: { extension: nil}
+          }.each do |key, data|
 
-    location / {
-        try_files /system/maintence.html
-          $uri $uri/index.html $uri.html
-          @passenger;
-    }
+            desc "generates nginx #{key} file"
+            task key do
+              template_dir = Pathname.new(File.dirname(__FILE__)).join 'templates'
+              app_name     = [application, exists?(:stages) ? stage : nil].compact.join(?_)
+              file_name    = [app_name, data[:extension]].compact.join ?.
+              conf_file    = ERB.new(File.read(template_dir.join "#{key}.erb"), nil, '-').result binding
 
-    location @passenger {
-        proxy_set_header Host $host;
-        proxy_set_header X-Forwarded-For $remote_addr;
+              puts conf_file
+              # save file in application tmp dir
+              put conf_file, File.join(current_path, 'tmp', file_name).to_s
+            end
 
-        proxy_pass #{proxy_pass};
-    }
-
-    error_page 500 502 503 504 /500.html;
-    error_page 404 403 /404.html;
-}
-
-CONF
+          end
 
-          puts conf_file
-          # save file in application tmp dir
-          put conf_file, Pathname.new(current_path).join('tmp', [application, exists?(:stages) ? stage : nil].compact.join(?_)).to_s
         end
 
       end

data/lib/capistrano_misc_recipes/templates/god.erb

@@ -0,0 +1,14 @@
+God.watch do |w|
+  w.name     = <%= app_name.inspect %>
+  w.start    = <%= "su -l #{ user } -c '#{ start_command }'".inspect %>
+  w.stop     = <%= "su -l #{ user } -c '#{ stop_command }'".inspect %>
+  w.pid_file = <%= passenger_pid_file.to_s.inspect %>
+
+  w.behavior(:clean_pid_file)
+  w.start_if do |start|
+    start.condition(:process_running) do |c|
+      c.interval = 10.minutes
+      c.running = false
+    end
+  end
+end

data/lib/capistrano_misc_recipes/templates/nginx.erb

@@ -0,0 +1,32 @@
+# nginx virtual host file for
+#    application: <%= application %>
+<% if exists? :stages -%>
+#    stage: <%#= stage %>
+<% end -%>
+#
+
+server {
+    listen 80;
+    server_name <%= app_name %>;
+    root <%= File.join current_path, 'public' %>;
+    client_max_body_size 15M;
+
+    location / {
+        try_files /system/maintence.html
+          $uri $uri/index.html $uri.html
+          @passenger;
+    }
+
+    location @passenger {
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $remote_addr;
+<% if passenger_use_socket -%>
+        proxy_pass "http://unix:<%= passenger_socket_file %>";
+<% else -%>
+        proxy_pass "http://<% passenger_address %>:<% passenger_port %>";
+<% end -%>
+    }
+
+    error_page 500 502 503 504 /500.html;
+    error_page 404 403 /404.html;
+}

data/lib/capistrano_misc_recipes/version.rb

@@ -1,3 +1,3 @@
 module CapistranoMiscRecipes
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_misc_recipes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -75,13 +75,14 @@ files:
 - Rakefile
 - capistrano_misc_recipes.gemspec
 - lib/capistrano_misc_recipes.rb
-- lib/capistrano_misc_recipes/.passenger.rb.swo
 - lib/capistrano_misc_recipes/bundler.rb
 - lib/capistrano_misc_recipes/console.rb
 - lib/capistrano_misc_recipes/db_dump.rb
 - lib/capistrano_misc_recipes/dbfetch.rb
 - lib/capistrano_misc_recipes/passenger.rb
 - lib/capistrano_misc_recipes/tasks.rb
+- lib/capistrano_misc_recipes/templates/god.erb
+- lib/capistrano_misc_recipes/templates/nginx.erb
 - lib/capistrano_misc_recipes/version.rb
 homepage: http://github.com/corlinus/capistrano_misc_recipes
 licenses:
@@ -98,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4105244698074156849
+      hash: 1047313683594404599
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4105244698074156849
+      hash: 1047313683594404599
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25