magic_recipes_two 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df598a5efd7d36ef193540a1e28f2a2b8bfab3b4
-  data.tar.gz: 7aeac14b4abb49fb2be7d356634bab95fbda2058
+  metadata.gz: 6e23444aecb6394830e7bb6c422b8dcc23348c4e
+  data.tar.gz: f6b5bc734ac60d908bfc64054ce419a46d83dc8e
 SHA512:
-  metadata.gz: 9a126e17536d15d1e90fd92720e6f00da09852c2a7847ebf2ea670fa5f361943483b28c87e351ee3cd18146bcd78ebf1ce9e878f2d5601f0eacd6c516f472de6
-  data.tar.gz: 16d20a959ed12e9d8d6ac748df89c6dfb10731f4740dc69208dc054205b0165776da8fd8c9e76fca84f2a13e51daa2339a227f3ecee59cbe1b22827ba6e916dd
+  metadata.gz: 1a9807d60cb9bcfb13ee6c704416fc6097c3b416925d1dcb8284c1ab2a5c195579a7fbd1abcef3c1d817e0dfcb8c6e406b702e843a04423e2c521a5c23dd2de5
+  data.tar.gz: 3bf403c118f0484e0899bdeadfdfcd13d80e3f5da17e0d54a0cae197845c646ce095c6c990ddbb9c5cc71f0738cce6aa02f31e94e188b2b7d37dbeeb74eefbc5

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/lib/capistrano/tasks/secrets.rake

@@ -6,10 +6,9 @@ namespace :load do
     set :secrets_roles,       -> { :app }
     set :secrets_profile,     -> { "profile" } # "profile" | "bashrc"
     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)}" }
+    set :secrets_set_both,    -> { false }
   end
 end
 
@@ -27,20 +26,47 @@ namespace :secrets do
   end
   
   
-  desc "set secret-key in .bashrc"
-  task :export do
+  desc "set secret-key in .profile or .bashrc"
+  task :profile 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 >> .#{fetch(:secrets_profile)}"
-        execute :sudo,  "echo 'export #{fetch(:secrets_token_name)}=#{fetch(:secrets_token)}' | cat >> .#{fetch(:secrets_profile)}"
+        if fetch(:secrets_set_both, false)
+          execute :sudo,  "echo 'export SECRET_KEY_BASE=#{fetch(:secrets_key_base)}' | cat >> .#{fetch(:secrets_profile)}"
+        end
+      end
+    end
+  end
+  
+  
+  desc "export secret-key in actual bash env"
+  task :export do
+    on release_roles fetch(:secrets_roles) do
+      within fetch(:secrets_user_path) do
         execute "export #{fetch(:secrets_key_name)}=#{fetch(:secrets_key_base)}"
-        execute "export #{fetch(:secrets_token_name)}=#{fetch(:secrets_token)}"
+        if fetch(:secrets_set_both, false)
+          execute "export SECRET_KEY_BASE=#{fetch(:secrets_key_base)}"
+        end
       end
     end
   end
   
+  
+  desc "export secret-key in actual bash env"
+  task :printenv do
+    on release_roles fetch(:secrets_roles) do
+      within fetch(:secrets_user_path) do
+        execute "printenv"
+        execute :echo, "$SECRET_KEY_BASE"
+        execute :echo, "$#{fetch(:secrets_key_name)}"
+      end
+    end
+  end
+  
+  
   desc 'secrets setup task (upload and set)'
   task :setup do
+    invoke "secrets:profile"
     invoke "secrets:export"
     invoke "secrets:upload"
   end

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

@@ -1,4 +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.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Torsten Wetzel