deploy_mate 0.18.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8015a223be95cf034bc92c203370e527b870b59a
-  data.tar.gz: a68d6e4be14b9b7fba434ffb3ca62cded6afdbad
+  metadata.gz: 221d9dcd04b1b34307ac5f64f794acac59350c48
+  data.tar.gz: 54a6b901d5cac8605209b3a4a85d00833685a031
 SHA512:
-  metadata.gz: f78cc6d64ad514db68e0e964d2a765bd5d9d20ef6c6410dd27d920ec6db39413376af3fc3db1860410c9cec9bd36f194ae0fad4e6f5771417f584ab7bad50b01
-  data.tar.gz: b4cbdd8fc83c41247a7729a494db321a1762dabb330cdcd23f1f8f9b270a00c165c7c50694159b0589fe923515c003da9381af03700ae834503a5d2aeeaea6ad
+  metadata.gz: df7304f62064c6722b1b02c6b918ed1388b92d784509c10597269adf6d2b6c50dd478af477077172a1af95a34e4f4bbe2d1735e3533963f8b61346e9474088b4
+  data.tar.gz: 8aa0a62a0c22561f2f04ed8b630f926bd4cd6bde4d3d22234c5c4efc618b659c7b0ad19ab0c1ba1fe8a17b7e45d9eabc9b6d684f0de06fa8010a5d4fb36145d2

data/README.md

@@ -29,7 +29,7 @@ It uses the following Capistrano-roles to divide the installed components:
 - **cronjobs**: [OPTIONAL] For environments where `whenever` should manage/run cronjobs
 
 ## Changelog
-* **0.18.3 (2016-03-22)**: Added mandatory task to install `ssh_key`s
+* **0.18.4 (2016-03-22)**: Added mandatory task to install `ssh_key`s
 * **0.18.2 (2016-03-08)**: Added basic DDoS and flooding-proof via nginx `req_limit` and `fail2ban`
 * **0.18.1 (2016-03-01)**: Added support for memcached
 * **0.18 (2016-02-25)**: Added support for capistrano 3.4, Ask before overwriting existing config-files
@@ -91,3 +91,12 @@ This will bump you up to the latest repo-version.
 3. Run `cap <your-stage> machine:init` to install the needed packages.
 4. Run `cap <your-stage> machine:setup` the setup all needed configuration-files on the server
 5. Run `cap <your-stage> deploy branch=optional_branch` and be done.
+
+## Reinstalling SSH-Keys
+If you need to redeploy SSH Keys to your server (e.g. somebody leaves your team), run: 
+
+```
+bundle exec cap <your-stage> machine:install:ssh_keys
+```
+
+It will pull the SSH Keys from the location configured in your `deploy.rb`. You can also change it there.

data/deploy-mate.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.18.3"
+  s.version                   = "0.18.4"
 
   s.authors                   = ["Tim Adler", "Marcus Geißler", "Johannes Strampe"]
   s.date                      = %q{2016-03-22}

data/lib/capistrano/tasks/machine.rake

@@ -188,24 +188,26 @@ namespace :machine do
     desc "Installs new SSH Keys"
     task :ssh_keys do
       on roles(:app) do
-        file_names = fetch(:ssh_file_names)
+        file_patterns = fetch(:ssh_file_names)
 
-        puts "Installing SSH Keys from '#{file_names}'..."
+        puts "Installing SSH Keys from #{file_patterns.join(',')}..."
 
         keys = []
-        Dir.glob(File.expand_path(file_names)).each do |file_name|
-          next if File.directory?(file_name)
-          key_as_string = File.read(file_name)
-
-          if key_as_string.start_with?("ssh-rsa")
-            keys << key_as_string
-            puts file_name
-          else
-            warn "#{file_name} is NO publickey"
+        file_patterns.each do |file_pattern|
+          Dir.glob(File.expand_path(file_pattern)).each do |file_name|
+            next if File.directory?(file_name)
+            key_as_string = File.read(file_name)
+
+            if key_as_string.start_with?("ssh-rsa")
+              keys << key_as_string
+              puts file_name
+            else
+              warn "#{file_name} is NO publickey"
+            end
           end
         end
 
-        fail "No ssh-keys found in #{file_names}." unless keys.any?
+        fail "No ssh-keys found in #{file_patterns.join(',')}." unless keys.any?
 
         upload!(StringIO.new(keys.join("")), 'new_keys')
         sudo "rm ~/.ssh/authorized_keys"

data/lib/deploy_mate/templates/deploy.rb.erb

@@ -16,7 +16,7 @@ set :imagemagick, <%= @needs_imagemagick %>
 set :memcached, <%= @needs_memcached %>
 set :sidekiq, <%= @uses_sidekiq %>
 
-set :ssh_file_names, '<%= @ssh_file_names %>'
+set :ssh_file_names, ['<%= @ssh_file_names %>']
 
 # Optionals
 # Uncomment, if needed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_mate
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 0.18.4
 platform: ruby
 authors:
 - Tim Adler