magic_recipes_two 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43bc60f12d2140102af07f14cf233f3d5a975203
-  data.tar.gz: cb7eb36faa5db29025120f686360e59395bb132c
+  metadata.gz: b4f9505d5b722c1501903912e12ada771884aa03
+  data.tar.gz: 9320a6d1a5d8ebff1f57441517f540a74fe2f390
 SHA512:
-  metadata.gz: 8039fbed053d5c12f08ad8372eb38220190b3838d7f2056944203847fc8eb37d197cce2c25833a32e05dc96d53c5b9fd3332737d088a32d2cd152a649347ead4
-  data.tar.gz: b32d3fd401e82133d0779e64adafb0f69d8a4c55c39decc35bce654b181b046ac2fe875a7095a312aea5739549dc7036a01c4b33d475b6d172c7a2f132caa95b
+  metadata.gz: a0dbf4d5a541f8673c9acb39e085b3e4963cfb7e0649dd6895a3a0b45846a14a5d380a0d3d051c12982a6899a3b5fc0f6e5cfa630ca2b8d2f82b2d210136bdb2
+  data.tar.gz: ba065981aed2ad19f29f80721f4b78e4f577f10ba37c4279ebe9c331acc7f556821c79c16235fcdbd04cc7c9db82c2f1360b638eaeac2f0f4a1d1429a7846bf9

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.25"
+    VERSION = "0.0.26"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -3,30 +3,33 @@ include Capistrano::MagicRecipes::BaseHelpers
 
 namespace :load do
   task :defaults do
-    set :monit_roles, -> { :web }
-    set :monit_interval, -> { 30 }
-    set :monit_bin, -> { '/usr/bin/monit' }
+    set :monit_roles,                 -> { :web }
+    set :monit_interval,              -> { 30 }
+    set :monit_bin,                   -> { '/usr/bin/monit' }
+    set :monit_logfile,               -> { '/var/log/monit.log' }
+    set :monit_idfile,                -> { '/var/lib/monit/id' }
+    set :monit_statefile,             -> { '/var/lib/monit/state' }
     ## Mailer
-    set :monit_mail_server, -> { "smtp.gmail.com" }
-    set :monit_mail_port, -> { 587 }
-    set :monit_mail_authentication, -> { false } # SSLAUTO|SSLV2|SSLV3|TLSV1|TLSV11|TLSV12
-    set :monit_mail_username, -> { "foo@example.com" }
-    set :monit_mail_password, -> { "secret" }
-    set :monit_mail_to, -> { "foo@example.com" }
-    set :monit_mail_from, -> { "monit@foo.bar" }
-    set :monit_mail_reply_to, -> { "support@foo.bar" }
+    set :monit_mail_server,           -> { "smtp.gmail.com" }
+    set :monit_mail_port,             -> { 587 }
+    set :monit_mail_authentication,   -> { false } # SSLAUTO|SSLV2|SSLV3|TLSV1|TLSV11|TLSV12
+    set :monit_mail_username,         -> { "foo@example.com" }
+    set :monit_mail_password,         -> { "secret" }
+    set :monit_mail_to,               -> { "foo@example.com" }
+    set :monit_mail_from,             -> { "monit@foo.bar" }
+    set :monit_mail_reply_to,         -> { "support@foo.bar" }
     ## Additional stuff for postrgres
-    set :postgresql_roles, -> { :db }
-    set :postgresql_pid, -> { "/var/run/postgresql/9.1-main.pid" }
+    set :postgresql_roles,            -> { :db }
+    set :postgresql_pid,              -> { "/var/run/postgresql/9.1-main.pid" }
     ## WebClient
-    set :monit_http_client, -> { true }
-    set :monit_http_domain, -> { false }
-    set :monit_http_port, -> { 2812 }
-    set :monit_http_use_ssl, -> { false }
+    set :monit_http_client,           -> { true }
+    set :monit_http_domain,           -> { false }
+    set :monit_http_port,             -> { 2812 }
+    set :monit_http_use_ssl,          -> { false }
     set :monit_http_allow_self_certification, -> { false }
-    set :monit_http_pemfile, -> { "/etc/monit/monit.pem" }
-    set :monit_http_username, -> { "admin" }
-    set :monit_http_password, -> { "monitor" }
+    set :monit_http_pemfile,          -> { "/etc/monit/monit.pem" }
+    set :monit_http_username,         -> { "admin" }
+    set :monit_http_password,         -> { "monitor" }
     ##v Website
   end
 end

data/lib/capistrano/tasks/nginx.rake

@@ -130,4 +130,14 @@ namespace :nginx do
       end
     end
   end
-end
+end
+
+
+namespace :deploy do
+  after 'deploy:finished', :restart_nginx_app do
+    invoke "nginx:site:add"
+    invoke "nginx:site:enable"
+    invoke "nginx:restart"
+  end
+end
+

data/lib/capistrano/tasks/thin.rake

@@ -48,9 +48,19 @@ namespace :thin do
   
 end
 
-after 'deploy:published', nil do
-  on release_roles fetch(:thin_roles) do
+
+# => after 'deploy:published', nil do
+# =>   on release_roles fetch(:thin_roles) do
+# =>     invoke "thin:reconf"
+# =>     invoke "thin:restart"
+# =>   end
+# => end
+
+
+namespace :deploy do
+  before 'deploy:finished', :restart_thin_apps do
     invoke "thin:reconf"
     invoke "thin:restart"
   end
 end
+

data/lib/generators/capistrano/magic_recipes/templates/monit/monitrc.erb

@@ -1,8 +1,8 @@
 set daemon <%= fetch(:monit_interval) %>
 
-set logfile /var/log/monit.log
-set idfile /var/lib/monit/id
-set statefile /var/lib/monit/state
+set logfile <%= fetch(:monit_logfile) %>
+set idfile <%= fetch(:monit_idfile) %>
+set statefile <%= fetch(:monit_statefile) %>
 
 set eventqueue
     basedir /var/lib/monit/events
@@ -26,9 +26,9 @@ set mail-format {
               M O N I T
               
               <% if fetch(:monit_http_client) %><% if fetch(:monit_http_domain) %>
-              Web:      <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:monit_http_domain) %>:2812/
+              Web:      <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:monit_http_domain) %>:<%= fetch(:monit_http_port) %>/
               <% else %>
-              Web:      <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:app_server_ip) %>:2812/
+              Web:      <%= fetch(:monit_http_use_ssl) ? "https" : "http" %>://<%= fetch(:app_server_ip) %>:<%= fetch(:monit_http_port) %>/
               <% end %><% end %>
 }
 
@@ -46,8 +46,6 @@ set httpd port <%= fetch(:monit_http_port) %>
     <% if fetch(:monit_http_domain) %>
     use address <%= fetch(:monit_http_domain) %>
     <% end %>
-    # allow careagents.cloudapp.net
-    # allow 191.233.74.184
     # allow 127.0.0.1
     <% if fetch(:monit_http_use_ssl) %>
     ssl enable

data/lib/generators/capistrano/magic_recipes/templates/monit/thin.erb

@@ -3,8 +3,8 @@
   check process <%= fetch(:application) %>_<%= fetch(:stage) %>_thin_<%= n %> with pidfile <%= deploy_to %>/shared/pids/thin_<%= fetch(:application) %>_<%= fetch(:stage) %>.<%= n %>.pid
     group thin-<%= fetch(:application) %>
     group thin-<%= fetch(:stage) %>
-    start program = "/bin/su - <%= fetch(:user) %> -c 'cd <%= current_path %> ; bundle exec thin start -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' "
-    stop program = "/bin/su - <%= fetch(:user) %> -c 'cd <%= current_path %> ; bundle exec thin stop -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' " 
+    start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec thin start -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' "
+    stop program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec thin stop -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' " 
     if mem > 200.0 MB for 1 cycles then restart
     if cpu > 50% for 3 cycles then restart
     if 5 restarts within 5 cycles then timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails