magic_recipes_two 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 701132644420a73a66fe8ceae402b03b2b0ad9eb
-  data.tar.gz: b6dc0b5c078eee2d0bc0ca0d32118ab4f2b7f716
+  metadata.gz: a471d62eceaf93650bd72e5938f8f73892135e07
+  data.tar.gz: b715de43ec73f1540c18f29939d0de583a625fbd
 SHA512:
-  metadata.gz: 111283a705061400e7c056beed2c450a80e43b94f905bec785c0192a00e1f351476c738b797524f0a63c2bf209a703467ee7761dcc280ac5fd05aa436aaba9b8
-  data.tar.gz: 1adfa33de5d45958f0c46ba70cf9da83e02d1de1f54bfa7cf2fe6cbc12ddf297438e6df5d201f2a122b18462ca5cc2c8ef29446695b05f5bfe3d366a6158912f
+  metadata.gz: 02a34a6335509ad33ed8409b5708b8fc4c943490c3060ec8219dd17329d8413fe2d1ddac4d58bac8c021629831bc0202773acc443fcab3f8a2f34d74b93356f0
+  data.tar.gz: 1e3b94e853ba88a6ca9ee2c680d2c62ab9c6cde3ef644ac7b2a9a007ccd7ea6c595150c7f259768d9a60d58723b65bef0b324064eaddc91f7b44ddf3427fffd8

data/lib/capistrano/magic_recipes/base_helpers.rb

@@ -24,7 +24,7 @@ module Capistrano
       end
       
       def generate_secrect_key
-        SecureRandom.hex(123)
+        SecureRandom.hex(82)
       end
 
       def template_with_role(from, to, role = nil)

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/capistrano/tasks/secrets.rake

@@ -3,10 +3,12 @@ include Capistrano::MagicRecipes::BaseHelpers
 
 namespace :load do
   task :defaults do
-    set :secrets_roles,     -> { :app }
-    set :secrets_key_base,  -> { generate_secrect_key }
-    set :secrets_key_name,  -> { "#{ fetch(:application) }_#{ fetch(:stage) }_SECRET_KEY_BASE".gsub(/-/, "_").gsub(/[^a-zA-Z_]/, "").upcase }
-    set :secrets_user_path, -> { "/home/#{fetch(:user)}" }
+    set :secrets_roles,       -> { :app }
+    set :secrets_key_base,    -> { generate_secrect_key }
+    set :secrets_token,       -> { generate_secrect_key }
+    set :secrets_key_name,    -> { "#{ fetch(:application) }_#{ fetch(:stage) }_SECRET_KEY_BASE".gsub(/-/, "_").gsub(/[^a-zA-Z_]/, "").upcase }
+    set :secrets_token_name,  -> { "#{ fetch(:application) }_#{ fetch(:stage) }_SECRET_TOKEN".gsub(/-/, "_").gsub(/[^a-zA-Z_]/, "").upcase }
+    set :secrets_user_path,   -> { "/home/#{fetch(:user)}" }
   end
 end
 
@@ -29,7 +31,9 @@ namespace :secrets do
     on release_roles fetch(:secrets_roles) do
       within fetch(:secrets_user_path) do
         execute :sudo,  "echo 'export #{fetch(:secrets_key_name)}=#{fetch(:secrets_key_base)}' | cat >> .bashrc"
+        execute :sudo,  "echo 'export #{fetch(:secrets_token_name)}=#{fetch(:secrets_token)}' | cat >> .bashrc"
         execute "export #{fetch(:secrets_key_name)}=#{fetch(:secrets_key_base)}"
+        execute "export #{fetch(:secrets_token_name)}=#{fetch(:secrets_token)}"
       end
     end
   end

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

@@ -1,2 +1,3 @@
 <%= fetch :stage %>:
   secret_key_base: <%= "<#{'%'}= ENV[\"#{ fetch(:secrets_key_name) }\"] #{'%'}>" %>
+  secret_token: <%= "<#{'%'}= ENV[\"#{ fetch(:secrets_token_name) }\"] #{'%'}>" %>

metadata

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