magic_recipes_two 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ab968aa5ad308040c197df5f828a82c5f69b823
-  data.tar.gz: 9501dd1122ec6a4d120e8e35c89bba25b4c11583
+  metadata.gz: 53ac495aa6bc572fa1ce4d365d1c6e49bcedefe7
+  data.tar.gz: baa26970bb1e3e3d947782ea93b02cb9f5e35a5a
 SHA512:
-  metadata.gz: 1f776eb327e98a30cb52b92a3d83fc5372ec88f35c22b62815465a879efa055d98d5165cd25c9b7c48972a4badfed72f5c77ff63152d63bd040b57db6f082e78
-  data.tar.gz: 195f112cb1a9f700854a98683f9b538105504a31b5c9c9882d64e466f7ce225f71ca642970c0b2e6a2aa1bcaafde3ca09015a7c0ad1058dd19969cc0069ac0bc
+  metadata.gz: cf8138cbce42a4250c6183f3c623517a128d663798cdfb9b45613b17538e0a14cec126b9c9f818ac5bfe19771e30b82fe04f0ec2baea576b5da468d69aa9b0df
+  data.tar.gz: c133b7da045f11b2c86ffa0db71f1d2319e74d2d8b72b5c8c548e06f6f84a3768943d735b746d15c15d4804a927e109a1263a91715d35d8bef09b317f55877ea

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.27"
+    VERSION = "0.0.28"
   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 %> ;<% if fetch(:monit_thin_with_secret) %> export SECRET_KEY_BASE=<%= fetch(:secrets_key_base) %>;<% end %> bundle exec thin start -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

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

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

metadata

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