deploy_mate 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c147b5057ab98f1b7d09135001e7429c94e4351
-  data.tar.gz: 5c887841bef0409e4546798816488780dd3d4f5c
+  metadata.gz: 8015a223be95cf034bc92c203370e527b870b59a
+  data.tar.gz: a68d6e4be14b9b7fba434ffb3ca62cded6afdbad
 SHA512:
-  metadata.gz: baf968bb63926b1a15a0603536de6d5d49c15afaeae205ef5486ed4088e530a9abadbd65c2c1f0dd25522d75eac184cabfce90c0b108d57f2842c776c98537de
-  data.tar.gz: f26223846beef52a51e4be1c13904ef7b61a8a4268a729bb2b424d3b84404a06d9b716c637d2d0a27ac54164acf150be996183ebb6bbf2fd14635f7de117c039
+  metadata.gz: f78cc6d64ad514db68e0e964d2a765bd5d9d20ef6c6410dd27d920ec6db39413376af3fc3db1860410c9cec9bd36f194ae0fad4e6f5771417f584ab7bad50b01
+  data.tar.gz: b4cbdd8fc83c41247a7729a494db321a1762dabb330cdcd23f1f8f9b270a00c165c7c50694159b0589fe923515c003da9381af03700ae834503a5d2aeeaea6ad

data/README.md

@@ -29,6 +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.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

data/deploy-mate.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.18.2"
+  s.version                   = "0.18.3"
 
   s.authors                   = ["Tim Adler", "Marcus Geißler", "Johannes Strampe"]
-  s.date                      = %q{2016-02-17}
+  s.date                      = %q{2016-03-22}
   s.description               = %q{This is how we deploy around here.}
   s.summary                   = s.description
   s.email                     = %q{development (at) hanseventures (dot) com}

data/lib/capistrano/tasks/machine.rake

@@ -7,6 +7,7 @@ namespace :machine do
     on roles(:app) do
       apt_get_update
     end
+    invoke "machine:install:ssh_keys"
     invoke "machine:install:htop"
     invoke "machine:install:language_pack_de"
     invoke "machine:install:unattended_upgrades"
@@ -52,6 +53,7 @@ namespace :machine do
   end
   before :setup, "deploy:ensure_folder"
 
+  desc "Install all dependencies"
   namespace :install do
     task :set_defaults do
       on roles(:app) do
@@ -140,6 +142,10 @@ namespace :machine do
     task :ntp do
       on roles(:app) do
         apt_get_install("ntp") unless is_package_installed?("ntp")
+        sudo "chmod 666 /etc/timezone"
+        execute 'echo "Europe/Berlin" > /etc/timezone'
+        sudo "chmod 644 /etc/timezone"
+        sudo "dpkg-reconfigure -f noninteractive tzdata"
       end
     end
 
@@ -179,6 +185,34 @@ namespace :machine do
       end
     end
 
+    desc "Installs new SSH Keys"
+    task :ssh_keys do
+      on roles(:app) do
+        file_names = fetch(:ssh_file_names)
+
+        puts "Installing SSH Keys from '#{file_names}'..."
+
+        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"
+          end
+        end
+
+        fail "No ssh-keys found in #{file_names}." unless keys.any?
+
+        upload!(StringIO.new(keys.join("")), 'new_keys')
+        sudo "rm ~/.ssh/authorized_keys"
+        sudo "mv new_keys ~/.ssh/authorized_keys"
+      end
+    end
+
     task :update_rvm_key do
       on roles(:app) do
         execute :gpg, "--keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"

data/lib/deploy_mate/tasks.rake

@@ -5,23 +5,24 @@ namespace :deploy_mate do
   desc 'Installs the needed capistrano files to deploy with the mate.'
   task :install do |t,args|
     puts "I'm your DEPLOY_MATE."
-    puts "We will setting up your deployment now."
-
-    @app_name = ask("[01/15] App-Name (for nginx, servers, etc.)", guess_app_name)
-    @stage_name = ask("[02/15] Give the first stage a name", "prestage")
-    @ssh_name = ask("[03/15] SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
-    @ruby_version = ask("[04/15] Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
-    @db_engine = ask_until("[05/15] What db are you using?", %w( postgresql mysql ), "mysql")
-    @app_server = ask_until("[06/15] What app server do you want to use?", %w( unicorn puma ), "unicorn")
-    @repo_url = ask("[07/15] Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
-    @is_rails = yes_or_no?("[08/15] Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
-    @needs_imagemagick = yes_or_no?("[09/15] Does this project need ImageMagick ?", (needs_imagemagick? ? "yes" : "no"))
-    @uses_sidekiq = yes_or_no?("[10/15] Does this project use Sidekiq ?", (uses_sidekiq? ? "yes" : "no"))
-    @branch_name = ask("[11/15] Branch to deploy '#{@stage_name}' from", "dev")
-    @host_name = ask("[12/15] Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
-    @environment = ask("[13/15] #{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
-    @needs_elasticsearch = yes_or_no?("[14/15] Do you need ElasticSearch on this machine ?", "no")
-    @needs_memcached = yes_or_no?("[15/15] Do you need Memcached on this machine ?", (needs_memcached? ? "yes" : "no"))
+    puts "We will set up your deployment now."
+
+    @app_name =             ask("[01/16] App-Name (for nginx, servers, etc.)", guess_app_name)
+    @stage_name =           ask("[02/16] Give the first stage a name", "prestage")
+    @ssh_name =             ask("[03/16] SSH-Hostname for the server", "#{@app_name}-#{@stage_name}")
+    @ssh_file_names =       ask("[04/16] SSH Keys to be installed", "~/.ssh/*.pub")
+    @ruby_version =         ask("[05/16] Ruby-Version (the RVM-way, e.g. ruby-2.2.0)", guess_ruby_version)
+    @db_engine =            ask_until("[06/16] What db are you using?", %w( postgresql mysql ), "mysql")
+    @app_server =           ask_until("[07/16] What app server do you want to use?", %w( unicorn puma ), "unicorn")
+    @repo_url =             ask("[08/16] Url-Location of git-repo", "git@github.com:hanseventures/#{@app_name}.git")
+    @is_rails =             yes_or_no?("[09/16] Is this a RAILS project ?", (rails_present? ? "yes" : "no"))
+    @needs_imagemagick =    yes_or_no?("[10/16] Does this project need ImageMagick ?", (needs_imagemagick? ? "yes" : "no"))
+    @uses_sidekiq =         yes_or_no?("[11/16] Does this project use Sidekiq ?", (uses_sidekiq? ? "yes" : "no"))
+    @branch_name =          ask("[12/16] Branch to deploy '#{@stage_name}' from", "dev")
+    @host_name =            ask("[13/16] Web-URL for '#{@stage_name}'", "#{@stage_name}.#{@app_name}")
+    @environment =          ask("[14/16] #{@stage_name}'s environment (RACK_ENV/RAILS_ENV)", "#{@stage_name}")
+    @needs_elasticsearch =  yes_or_no?("[15/16] Do you need ElasticSearch on this machine ?", "no")
+    @needs_memcached =      yes_or_no?("[16/16] Do you need Memcached on this machine ?", (needs_memcached? ? "yes" : "no"))
 
     puts "Aye!"
     puts "Worrrrking..."

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

@@ -16,6 +16,8 @@ set :imagemagick, <%= @needs_imagemagick %>
 set :memcached, <%= @needs_memcached %>
 set :sidekiq, <%= @uses_sidekiq %>
 
+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.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Tim Adler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano