deploy_mate 0.2 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec32c8e52b90f88a44633352ed01087acea7343f
-  data.tar.gz: 327d9df9c6fcb3de20af741a7415add88de714f4
+  metadata.gz: 331e342b761f203348e39e17f3deb3ea338eb868
+  data.tar.gz: 3a0ea8e0bc854d1569c799c7ff602221fb56f258
 SHA512:
-  metadata.gz: 81d39a9da921f0b483e5e5f5a9684d1f9e8bea2d5b93d6701d7f584da05b77c4511a195552d39d2fccea132f9a27397a3d051d60f754211f102946130ea6f287
-  data.tar.gz: ff6de13126be717222170a8556ceb61d8e6b8fe5b9d53beb1455bfbc795d57d9442bdffbdd7c309815b26eddbc1d744ad68c2de90acd178794481858225761ca
+  metadata.gz: 9956a9f6494627990d13e8394ffbc394ac7cbe83b42d6b071dab50e8f2a865df5dcd0e7a1ac3e3a16011d3fc60bd09229224cf803815ccb9fc252b0535198b8a
+  data.tar.gz: 1c74e9cde74a5fe37f2f2404a378442194472f30d323b6f852ff06dfb582898122a56369e430695f187d330904240fb6c673bd93e1ac3ad8b218d91d50b475d9

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+ruby-2.2.0

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    deploy_mate (0.18.4)
+    deploy_mate (0.1)
       capistrano (~> 3.0)
       capistrano-bundler
       capistrano-rails
-      rake
 
 GEM
   remote: https://rubygems.org/
@@ -17,15 +16,17 @@ GEM
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.1.6)
+    capistrano-rails (1.1.2)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
+    colorize (0.7.5)
     i18n (0.7.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
-    rake (10.5.0)
-    sshkit (1.8.1)
+    net-ssh (2.9.2)
+    rake (10.4.2)
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
 
@@ -34,6 +35,3 @@ PLATFORMS
 
 DEPENDENCIES
   deploy_mate!
-
-BUNDLED WITH
-   1.11.2

data/README.md

@@ -4,74 +4,65 @@
 
 This little gem can be added to your ruby-projects in order to **set up a working ruby-server** and **deploy** to it.
 
-The resulting server will work with this setup:
-- [NGINX](http://nginx.org/) Webserver
-- [Unicorn](http://unicorn.bogomips.org/) Rack App Server / [Puma](http://puma.io/) Rack App Server
-- [Bluepill](https://github.com/bluepill-rb/bluepill) Process Monitoring
-- [RVM](http://rvm.io) as user-install
-- [Optional] [ImageMagick](http://www.imagemagick.org)
+The resulting server will work with this setup: 
+- NGINX Webserver (http://nginx.org/)
+- Unicorn Rack App Server (http://unicorn.bogomips.org/)
+- Bluepill Process Monitoring (https://github.com/bluepill-rb/bluepill)
+- RVM as user-install (http://rvm.io)
 
 Other stuff taken care of:
 - Logration
 - Automatic updates
 - NTP
 
-You can choose a Database-Engine:
+You can choose Database:
 - MySQL
 - Postgres
 
-**If you are not using Amazon AWS as a host:** The GEM needs a working Amazon AWS-style `ubuntu`-user on the system in order to work properly. It will create one, if needed.
-
-It uses the following Capistrano-roles to divide the installed components:
-- **web**: Machines with this role run NGINX as proxy
-- **app**: Machines with this role run the Ruby-webapp
-- **search**: [OPTIONAL] Machines with this role run ElasticSearch
-- **cronjobs**: [OPTIONAL] For environments where `whenever` should manage/run cronjobs
+## Changelog
+* **2015-04-29**: Load custom rake tasks from lib/capistrano/tasks directory.
+You need to run the generator ```rake deploy_mate:install``` again or add ```Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }``` to your Capfile.
 
 ## Installation
-* Add the gem to your Gemfile (`gem 'deploy_mate'`) and run `bundle install`.
-* Spawn yourself a basic **Ubuntu 14** at the provider of your choice.
-* Create a working SSH-configuration for that server and try it out using `ssh <your-server-name>`.
-
-## Generate the Capistrano files
-* Generate the configuration file: `bundle exec rake deploy_mate:default_config`
-* Edit the configuration file: `open config/deploy_mate.yml`
-* Generate the Capistrano files out of the config: `bundle exec rake deploy_mate:install`
+Add this to your project's `Gemfile`:
 
-**NOTE** for non-rails applications:
-Since rails supports auto-loading rake tasks, any non-rails application must load the deploy mate rake tasks manually.
-At **the end** of the your project's `Rakefile`:
 ```
-load 'deploy_mate/tasks.rake'
+gem 'deploy_mate'
 ```
-When done: **Remove** `load 'deploy_mate/tasks.rake'` from your `Rakefile`. It is not needed anymore and will otherwise only cause problems.
+and run `bundle install`.
 
-## Using deploy mate
+After installing the gem you need to generate the files needed to be able to deploy with **capistrano**.
 
-### Initialize needed server packages
-```
-bundle exec cap <your-stage> machine:init
+Add this at **the end** of your project's `Rakefile`:
 ```
-
-### Copy needed templates
+load 'deploy_mate/tasks.rake'
 ```
-bundle exec cap <your-stage> machine:setup
+then run
 ```
+rake deploy_mate:install
+````
 
-### Deploy the application
-```
-bundle exec cap <your-stage> deploy
-```
+Follow the instructions.
 
-### Reinstalling SSH-Keys
-If you need to redeploy SSH Keys to your server (e.g. somebody leaves your team),you can
-always come back to your configuration file at `config/deploy_mate.yml`, change the
-values and generate the Capistrano files again with `bundle exec rake deploy_mate:install`.
-To setup just the ssh keys run:
+This will create the following files for you:
 
 ```
-bundle exec cap <your-stage> machine:install:ssh_keys
+Capfile
+config/deploy.rb
+config/deploy/<your-stage>.rb
 ```
+When done: **Remove** `load 'deploy_mate/tasks.rake'` from your `Rakefile`. It is not needed anymore and will otherwise only cause problems.
 
-### Overwriting Templates
-You can overwrite the templates used to setup the server. Just place the desired template in your project under `lib/capistrano/configs` and rerun the setup task. All existing templates can be found in this repo under [lib/capistrano/configs](https://github.com/hanseventures/deploy-mate/tree/master/lib/capistrano/configs).
+## Updating the gem
+Should you need to update your `deploy_mate`-version (e.g. because somebody fixed a bug in the gem), run:
+```
+bundle update deploy_mate
+```
+This will bump you up to the latest repo-version.
+
+## Setting up a server
+1. Spawn yourself a basic **Ubuntu 14** at the provider of your choice.
+2. Create a working SSH-configuration for that server and try it our using `ssh <your-server-name>`
+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` and be done.

data/deploy-mate.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name                      = "deploy_mate"
-  s.version                   = "0.2"
+  s.version                   = "0.11"
 
-  s.authors                   = ["Tim Adler", "Marcus Geißler", "Johannes Strampe"]
-  s.date                      = %q{2016-03-22}
+  s.authors                   = ["Tim Adler"]
+  s.date                      = %q{2015-04-02}
   s.description               = %q{This is how we deploy around here.}
   s.summary                   = s.description
-  s.email                     = %q{development (at) hanseventures (dot) com}
+  s.email                     = %q{tim.adler (at) hanseventures (dot) com}
   s.license                   = "MIT"
 
   s.files                     = `git ls-files`.split("\n")
@@ -19,4 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'capistrano-bundler'
   s.add_dependency 'capistrano-rails'
   s.add_dependency 'rake'
+
+  # s.add_development_dependency 'rake', '~> 10.1.0'
+
 end

data/lib/capistrano/configs/logrotate.erb

@@ -17,6 +17,6 @@
                 [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
         endscript
         lastaction
-                [ ! -f <%= shared_path %>/system/pids/<%= fetch(:app_server) %>.pid ] || kill -USR1 `cat <%= shared_path %>/system/pids/<%= fetch(:app_server) %>.pid`
+                [ ! -f <%= shared_path %>/system/pids/unicorn.pid ] || kill -USR1 `cat <%= shared_path %>/system/pids/unicorn.pid`
         endscript
-}
+}

data/lib/capistrano/configs/nginx_app.conf.erb

@@ -1,9 +1,7 @@
-upstream appserver_upstream {
-  server unix:<%= shared_path %>/system/sockets/<%= fetch(:app_server) %>.sock;
+upstream unicorn_upstream {
+  server unix:<%= shared_path %>/system/sockets/unicorn.sock;
 }
 
-limit_req_zone $binary_remote_addr zone=rate_limit:10m rate=10r/s;
-
 server {
   listen 80;
   server_name <%= fetch(:nginx_server_name) %>;
@@ -18,15 +16,12 @@ server {
   root <%= current_path %>/public;
 
   location @<%= fetch(:application) %> {
-    limit_req zone=rate_limit burst=20;
-    limit_req_status 444;
-
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Proto http;
     proxy_set_header Host $http_host;
     proxy_redirect off;
 
-    proxy_pass http://appserver_upstream;
+    proxy_pass http://unicorn_upstream;
     break;
   }
 

data/lib/capistrano/configs/nginx_base.conf.erb

@@ -25,7 +25,7 @@ http {
   gzip_comp_level 6;
   gzip_proxied any;
   gzip_types text/plain text/css text/xml text/javascript text/comma-separated-values
-             application/json application/x-javascript application/xml application/xml+rss image/svg+xml;
+             application/json application/x-javascript application/xml application/xml+rss;
 
   # see http://blog.leetsoft.com/2007/7/25/nginx-gzip-ssl
   gzip_buffers 16 8k;

data/lib/capistrano/configs/unicorn.pill.erb

@@ -0,0 +1,28 @@
+shared_path = "<%= shared_path %>"
+current_path = "<%= current_path %>"
+
+Bluepill.application("<%= fetch(:application) %>", :log_file => "#{shared_path}/log/bluepill.log") do |app|
+
+  app.working_dir = current_path
+  app.uid = 'ubuntu'
+  app.gid = 'www-data'
+  app.process("unicorn") do |process|
+    process.pid_file = "#{shared_path}/system/pids/unicorn.pid"
+    process.environment = { 'BUNDLE_GEMFILE' => "#{current_path}/Gemfile" }
+
+    process.start_command = "/home/ubuntu/.rvm/wrappers/default/bundle exec unicorn -c #{shared_path}/config/unicorn.rb -E <%= fetch(:environment) %> -D"
+    process.stop_command = "kill -QUIT {{PID}}"
+    process.restart_command = "kill -USR2 {{PID}}"
+
+    process.start_grace_time = 10.seconds
+    process.stop_grace_time = 10.seconds
+    process.restart_grace_time = 10.seconds
+
+    process.monitor_children do |child_process|
+      child_process.stop_command = "kill -9 {{PID}}"
+
+      child_process.checks :mem_usage, :every => 30.seconds, :below => 500.megabytes, :times => [3,4], :fires => :stop
+    end
+  end
+
+end

data/lib/capistrano/configs/upstart.conf.erb

@@ -4,6 +4,6 @@ start on runlevel [2]
 stop on runlevel [016]
 
 expect daemon
-exec /home/ubuntu/.rvm/wrappers/default/bluepill load <%= shared_path %>/config/<%= fetch(:application)%>.pill
+exec /home/ubuntu/.rvm/wrappers/default/bluepill load <%= shared_path %>/config/unicorn.pill
 
 respawn

data/lib/capistrano/deploy_mate_capfile.rb

@@ -23,11 +23,11 @@ require 'capistrano/bundler'
 require "capistrano/helpers.rb"
 
 # Load custom modules with helper functions
-%w(aptitude bluepill upstart user_management shell).each do |m|
+%w(aptitude bluepill upstart).each do |m|
   load File.expand_path("../modules/#{m}.rb", __FILE__)
 end
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
-%w(bluepill fail2ban logrotate machine elasticsearch nginx rvm unicorn puma upstart).each do |t|
+%w(bluepill logrotate machine nginx rvm unicorn upstart).each do |t|
   import File.expand_path("../tasks/#{t}.rake", __FILE__)
 end

data/lib/capistrano/deploy_mate_defaults.rb

@@ -9,7 +9,7 @@ set :rvm_ruby_version, "ruby-2.2.0"
 set :rvm_map_bins, %w{gem rake ruby rvmsudo bundle}
 
 set :deploy_to, "/srv/#{fetch(:application)}"
-set :linked_dirs, fetch(:linked_dirs, []).push(*%w{log vendor/bundle system/pids system/sockets public/assets})
+set :linked_dirs, %w{log vendor/bundle system/pids system/sockets public/assets}
 
 set :keep_releases, 3
 set :ssh_options, { forward_agent: true }
@@ -19,13 +19,12 @@ set :bundle_flags, "--deployment"
 set :bundle_without, %w{development test}.join(' ')
 set :bundle_exec, "bundle exec"
 
-# app server
-set :app_server, "unicorn" # default to unicorn if nothing set
-
 namespace :deploy do
   desc 'Restart application'
   task :restart do
-    invoke "bluepill:restart"
+    on roles(:app), in: :sequence, wait: 5 do
+      invoke "unicorn:phased_restart"
+    end
   end
 
   desc 'Ensure that the app folder is present'

data/lib/capistrano/helpers.rb

@@ -2,9 +2,7 @@
 # This file is loaded before the tasks
 
 def template(from, to)
-  path = File.expand_path("lib/capistrano/configs/#{from}", ENV['PWD'])
-  path = File.expand_path("../configs/#{from}", __FILE__) unless File.exists?(path)
-  erb = File.read(path)
+  erb = File.read(File.expand_path("../configs/#{from}", __FILE__))
   compiled = ERB.new(erb).result(binding)
   io = StringIO.new(compiled)
   upload! io, to
@@ -19,4 +17,4 @@ def execute_script(name, params = "")
   execute "chmod 755 #{name}"
   execute "./#{name} #{params}"
   execute "rm #{name}"
-end
+end

data/lib/capistrano/scripts/set_defaults.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 source ~/.rvm/scripts/rvm
-rvm --default $1
-echo "gem: --no-rdoc --no-ri" >> ~/.gemrc
+rvm --default $1

data/lib/capistrano/tasks/bluepill.rake

@@ -1,51 +1,27 @@
 namespace :bluepill do
-  include Shell
 
   desc "Installs the application pill"
   task :setup do
     on roles(:app) do
       execute "mkdir -p #{shared_path}/config"
-      template "application.pill.erb", "#{shared_path}/config/#{fetch(:application)}.pill"
+      template "unicorn.pill.erb", "#{shared_path}/config/unicorn.pill"
     end
   end
 
   desc "Starts bluepill"
   task :start do
     on roles(:app) do
-      if !bluepill_running?
-        sudo "start bluepill"
-      else
-        info "No need to start bluepill, it is running!"
-      end
+      sudo "start bluepill"
     end
   end
 
-  desc "Stops app server"
+  desc "Stops unicorn"
   task :stop do
     on roles(:app) do
-      if bluepill_running?
-        sudo "stop bluepill"
-      else
-        "Can't stop bluepill because it's not running!"
-      end
+      sudo "stop bluepill"
     end
   end
 
-  desc "Restarts/Reloads app gracefully"
-  task :restart do
-    invoke "bluepill:start"
 
-    on roles(:app) do
-      if bluepill_running?
-        if pill_running?(fetch(:app_server))
-          execute :rvmsudo, :bluepill, fetch(:application), :restart
-        else
-          execute :rvmsudo, :bluepill, fetch(:application), :start
-        end
-      end
-    end
-
-    invoke "nginx:reload"
-  end
-  before :restart, 'rvm:hook'
 end
+

data/lib/capistrano/tasks/logrotate.rake

@@ -1,5 +1,4 @@
 namespace :logrotate do
-  include Shell
 
   desc "Install the logrotate config"
   task :setup do

data/lib/capistrano/tasks/machine.rake

@@ -1,59 +1,38 @@
 namespace :machine do
   include Aptitude
-  include UserManagement
 
   desc "Sets up a blank Ubuntu to run our Rails-setup"
   task :init 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"
-    invoke "machine:install:ntp"
-    invoke "machine:install:git"
-    invoke "machine:install:nginx"
-    invoke "machine:install:fail2ban"
-    invoke "machine:install:rvm"
-    invoke "machine:install:ruby"
-    invoke "machine:install:set_defaults"
-    invoke "machine:install:bluepill"
-    invoke "machine:install:bundler"
-    invoke "machine:install:nodejs"
-    invoke "machine:install:elasticsearch"
-    invoke "machine:install:imagemagick" if fetch(:imagemagick)
-    invoke "machine:install:memcached" if fetch(:memcached)
-    invoke "machine:install:mysql_dev" if fetch(:db_engine) == "mysql"
-    invoke "machine:install:postgres_dev" if fetch(:db_engine) == "postgresql"
-  end
-  before "machine:init", "machine:check_ubuntu_user"
-  before "deploy", "machine:check_ubuntu_user"
-
-  desc "Check if we are doing things as the correct user"
-  task :check_ubuntu_user do
-    on roles(:app) do
-      unless am_i?("ubuntu")
-        execute_script("create_ubuntu_user.sh") # Creates an Amazon AWS-style 'ubuntu'-user on machines with only 'root'
-        error "Please use a use a user named 'ubuntu' to login to the machine."
-        fail
-      end
+      invoke "machine:install:htop"
+      invoke "machine:install:language_pack_de"
+      invoke "machine:install:unattended_upgrades"
+      invoke "machine:install:ntp"
+      invoke "machine:install:git"
+      invoke "machine:install:nginx"
+      invoke "machine:install:fail2ban"
+      invoke "machine:install:rvm"
+      invoke "machine:install:ruby"
+      invoke "machine:install:set_defaults"
+      invoke "machine:install:bluepill"
+      invoke "machine:install:bundler"
+      invoke "machine:install:nodejs"
+      invoke "machine:install:mysql_dev" if fetch(:db_engine) == "mysql"
+      invoke "machine:install:postgres_dev" if fetch(:db_engine) == "postgresql"
     end
   end
 
   desc "Install configs"
   task :setup do
     invoke "nginx:setup"
-    invoke "unicorn:setup" if fetch(:app_server) == "unicorn"
-    invoke "puma:setup" if fetch(:app_server) == "puma"
+    invoke "unicorn:setup"
     invoke "upstart:setup"
     invoke "logrotate:setup"
-    invoke "fail2ban:setup"
     invoke "bluepill:setup"
   end
   before :setup, "deploy:ensure_folder"
 
-  desc "Install all dependencies"
   namespace :install do
     task :set_defaults do
       on roles(:app) do
@@ -64,10 +43,6 @@ namespace :machine do
       end
     end
 
-    task :elasticsearch do
-      invoke 'elasticsearch:install'
-    end
-
     task :language_pack_de do
       on roles(:app) do
         apt_get_install("language-pack-de") unless is_package_installed?("language-pack-de")
@@ -102,18 +77,6 @@ namespace :machine do
       end
     end
 
-    task :imagemagick do
-      on roles(:app) do
-        apt_get_install("imagemagick") unless is_package_installed?("imagemagick")
-      end
-    end
-
-    task :memcached do
-      on roles(:app) do
-        apt_get_install("memcached") unless is_package_installed?("memcached")
-      end
-    end
-
     task :mysql_dev do
       on roles(:app) do
         apt_get_install("libmysqlclient-dev") unless is_package_installed?("libmysqlclient-dev")
@@ -142,10 +105,6 @@ 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
 
@@ -172,7 +131,6 @@ namespace :machine do
         unless is_package_installed?("imagemagick")
           apt_get_install("imagemagick")
           apt_get_install("libmagickcore-dev")
-          apt_get_install("libmagickwand-dev")
         end
       end
     end
@@ -185,41 +143,9 @@ namespace :machine do
       end
     end
 
-    desc "Installs new SSH Keys"
-    task :ssh_keys do
-      on roles(:app) do
-        file_patterns = fetch(:ssh_file_names)
-
-        next puts("Skip SSH key installation") if file_patterns == []
-
-        puts "Installing SSH Keys from #{file_patterns.join(',')}..."
-
-        keys = []
-        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_patterns.join(',')}." 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"
+        execute :gpg, "--keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3"
       end
     end
     before "machine:install:rvm", "machine:install:update_rvm_key"