magic_recipes_two 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21bc8774d1894689f6c7a0041cab57cea56e0797
-  data.tar.gz: b64dc61aa66c84060b3071259896198506bc0272
+  metadata.gz: 5c2b0b7af1195077f81b90071dc367159587c9eb
+  data.tar.gz: c887513e209a140402efe284a79dc72cd524be4d
 SHA512:
-  metadata.gz: 2f490805d2d4f0e7f013434a05cff99c964660595b92a6ebad24b80f78088dabeab34fd054a484549c3e1c154e52c33830cf720390e022507ab77ec36751e3cd
-  data.tar.gz: 307400ad78907bd20bfb8e4be5f3f75d29660ce331928f67f776b50fb90c48d9b24fc01bf6a9919bbb0abf060687f14c38234b635c2b90440f8d672c88bbc87b
+  metadata.gz: 17954f6767dec62c65fc1203be036fdbdf70d7856416f1a410514d8d3988b865628a09b9e05eb427ea8f1605444a2212f765b8a84b92b44ada9f35f96ce23f2d
+  data.tar.gz: c4a8dae99745d9ad2b790a0343bbf938fdbc82d5923ef2bae39eb3fd310688b938198fef2a3595486f055e47db4a9ee754ce7425f2f2226bdb8b10d59333451d

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.29"
+    VERSION = "0.0.30"
   end
 end

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

@@ -3,7 +3,7 @@
   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 - <%= @role.user %> -c 'cd <%= current_path %> ; bundle exec thin start -C config/thin_app_<%= fetch(:stage) %>.yml -o <%= n %>' "
+    start program = "/bin/su - <%= @role.user %> -c 'cd <%= current_path %> ;<% if fetch(:monit_thin_with_secret) %> export SECRET_KEY_BASE=<%= fetch(:secrets_key_base) %>; export <%= fetch(:secrets_key_name) %>=<%= fetch(:secrets_key_base) %>;<% end %> 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

data/lib/generators/capistrano/magic_recipes/templates/thin_app_yml.erb

@@ -16,7 +16,4 @@ servers: <%= fetch(:app_instances) %>
 # user: <%= fetch(:user) %>
 socket: /tmp/thin.<%= fetch(:application) %>.<%= fetch(:stage) %>.sock
 daemonize: true
-onebyone: <%= fetch(:thin_onebyone) %>
-<% if fetch(:monit_thin_with_secret) %>
-SECRET_KEY_BASE: <%= fetch(:secrets_key_base) %>
-<% end %>
+onebyone: <%= fetch(:thin_onebyone) %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Torsten Wetzel