teleporter 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcc38e9903c5b8c866c8b05705b2b9cea223c8ea
-  data.tar.gz: 15d99df82341dd8f30ae437e637a516ecf349dbd
+  metadata.gz: d3c07445ab18be348fd3f3ccbd82b248f5d654c5
+  data.tar.gz: ba980322715f1acc0dcfd6770107eb2e54df1b8a
 SHA512:
-  metadata.gz: ebf3eb53f850d6cd0134d0f75e096425b457a156cc15fa280bf2e1c50d09860f89f5ed33b8eacafbd47ea1d23447ab433906ef703a5392dec9e59a9a2e12bd4f
-  data.tar.gz: 577e5e1f3d721c7795a8374814f6627e4dcd565d9a0fd8f89bc7bd5e961d3b969300c6482d66c48b2566e9643fec100f36e9012d6adbbb24b95b9aa92391f2eb
+  metadata.gz: a9aa894358360582d1624a89872260087bfde9c1cabf5be239fe1db34c335343b41893592f6b4c8f4b6407ede5a6efb896df76c7fdb87afa99b23ffcd3b23ac1
+  data.tar.gz: 43e4ea96d0b4bc804043c922f2198e809a81a515df76b3ccf7494fc990622066fdf26f9957656582aa9866e8fde0145a259d1f15ad6c7cae7412449f186ad59b

data/lib/generators/teleport/capistrano.rb

@@ -9,7 +9,7 @@ module Teleport
         gem 'capistrano-bundler'
         gem 'capistrano-rails'
         gem 'capistrano-sidekiq'
-        gem 'capistrano3-puma'
+        gem 'capistrano3-puma', github: 'itsNikolay/capistrano-puma', branch: 'puma_monit_namespace'
       end
 
       Bundler.with_clean_env do

data/lib/generators/teleport/templates/capistrano/deploy/deploy.rb.tt

@@ -2,6 +2,7 @@ lock '3.2.1'
 
 set :repo_url, '<%= @git_repo_url %>'
 set :application, '<%= @app_name %>'
+set :deploy_to, -> { "/home/#{fetch(:deploy_user)}/apps/#{fetch(:application)}_#{fetch(:stage)}" }
 
 set :puma_init_active_record, true
 set :puma_preload_app, false

data/lib/generators/teleport/templates/capistrano/deploy/production.rb.tt

@@ -1,7 +1,6 @@
 set :stage, :production
 set :rails_env, :production
 set :branch, "master"
-set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:application)}_#{fetch(:stage)}"
 set :deploy_user, '<%= @deploy_user %>'
 set :ip, '<%= @production_server_address %>'
 

data/lib/generators/teleport/templates/capistrano/deploy/staging.rb.tt

@@ -1,7 +1,6 @@
 set :stage, :staging
 set :rails_env, :staging
 set :branch, "master"
-set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:application)}_#{fetch(:stage)}"
 set :deploy_user, '<%= @deploy_user %>'
 set :ip, '<%= @staging_server_address %>'
 

data/lib/generators/teleport/templates/capistrano/shared/monit_sidekiq.erb

@@ -1,11 +1,10 @@
-<% application = fetch(:application) %>
-set mail-format { subject: <%= "#{fetch(:full_app_name)} - #{fetch(:rails_env)}" %> $SERVICE $EVENT at $DATE }
+set mail-format { subject: <%= "#{fetch(:application)} - #{fetch(:stage)}" %> $SERVICE $EVENT at $DATE }
 
-check process sidekiq
+check process <%= fetch(:application) %>_<%= fetch(:stage) %>
   with pidfile <%= current_path %>/tmp/pids/sidekiq.pid
-  start program = "/etc/init.d/sidekiq_<%= application %>_<%= fetch(:rails_env)%> start"
-  stop program = "/etc/init.d/sidekiq_<%= application %>_<%= fetch(:rails_env)%> stop"
+  start program = "/etc/init.d/sidekiq_<%= fetch(:application) %>_<%= fetch(:stage)%> start"
+  stop program = "/etc/init.d/sidekiq_<%= fetch(:application) %>_<%= fetch(:stage)%> stop"
   if mem is greater than 500.0 MB for 1 cycles then restart       # eating up memory?
-  if cpu is greater than 50% for 2 cycles then alert                  # send an email to admin
-  if cpu is greater than 80% for 30 cycles then restart                # hung process?
+  if cpu is greater than 50% for 2 cycles then alert              # send an email to admin
+  if cpu is greater than 80% for 30 cycles then restart           # hung process?
   group sidekiq

data/lib/generators/teleport/templates/capistrano/tasks/setup_config.rake

@@ -12,20 +12,21 @@ namespace :deploy do
       set(:symlinks, [
         {
           source: "log_rotation",
-          link: "/etc/logrotate.d/{{application}}"
+          link: "/etc/logrotate.d/{{application}}_{{stage}}"
         },
         {
           source: "monit_sidekiq",
-          link: "/etc/monit/conf.d/sidekiq_{{application}}.conf"
+          link: "/etc/monit/conf.d/sidekiq_{{application}}_{{stage}}.conf"
         },
         {
           source: "sidekiq_init.sh",
-          link: "/etc/init.d/sidekiq_{{application}}"
+          link: "/etc/init.d/sidekiq_{{application}}_{{stage}}"
         },
       ])
       execute :mkdir, "-p #{shared_path}/config"
       execute :mkdir, "-p #{current_path}"
       application = fetch(:application)
+      stage = fetch(:stage)
 
       config_files = fetch(:config_files)
       config_files.each do |file|

data/lib/teleporter/version.rb

@@ -1,3 +1,3 @@
 module Teleporter
-  VERSION = "2.0.8"
+  VERSION = "2.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teleporter
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Ponomarev Nikolay
@@ -104,16 +104,8 @@ files:
 - lib/generators/teleport/templates/capistrano/deploy/deploy.rb.tt
 - lib/generators/teleport/templates/capistrano/deploy/production.rb.tt
 - lib/generators/teleport/templates/capistrano/deploy/staging.rb.tt
-- lib/generators/teleport/templates/capistrano/shared/database.example.yml.erb
 - lib/generators/teleport/templates/capistrano/shared/log_rotation.erb
-- lib/generators/teleport/templates/capistrano/shared/monit.erb
 - lib/generators/teleport/templates/capistrano/shared/monit_sidekiq.erb
-- lib/generators/teleport/templates/capistrano/shared/nginx.conf.erb
-- lib/generators/teleport/templates/capistrano/shared/puma.conf.erb
-- lib/generators/teleport/templates/capistrano/shared/puma.erb
-- lib/generators/teleport/templates/capistrano/shared/puma.rb.erb
-- lib/generators/teleport/templates/capistrano/shared/run-puma.erb
-- lib/generators/teleport/templates/capistrano/shared/sidekiq.yml.erb
 - lib/generators/teleport/templates/capistrano/shared/sidekiq_init.sh.erb
 - lib/generators/teleport/templates/capistrano/shared/unicorn.rb.erb
 - lib/generators/teleport/templates/capistrano/shared/unicorn_init.sh.erb

data/lib/generators/teleport/templates/capistrano/shared/database.example.yml.erb

@@ -1,11 +0,0 @@
-<%= fetch(:rails_env) %>:
-  adapter: postgresql
-  timeout: 5000
-  encoding: utf8
-  reconnect: false
-  database: <%= "#{fetch(:application)}_#{fetch(:rails_env)}" %>
-  pool: 5
-  username: <%= "#{fetch(:deploy_user)}" %>
-  password: secret
-  host:
-  port: 5432

data/lib/generators/teleport/templates/capistrano/shared/monit.erb

@@ -1,7 +0,0 @@
-# Monit configuration for Puma
-# Service name: <%= puma_monit_service_name %>
-#
-check process <%= puma_monit_service_name %>
-  with pidfile "<%= fetch(:puma_pid) %>"
-  start program = "/usr/bin/sudo -u <%= fetch(:deploy_user) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec puma -C <%= fetch(:puma_conf) %> --daemon'"
-  stop program = "/usr/bin/sudo -u <%= fetch(:deploy_user) %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec pumactl -S <%= fetch(:puma_state) %> stop'"

data/lib/generators/teleport/templates/capistrano/shared/nginx.conf.erb

@@ -1,55 +0,0 @@
-upstream puma {
-  server unix:/<%= fetch(:deploy_to) %>/shared/tmp/sockets/puma.sock fail_timeout=0;
-}
-
-server {
-  listen 80 default deferred;
-  root <%= fetch(:deploy_to) %>/current/public;
-
-  location ^~ /assets/ {
-    gzip_static on;
-    expires max;
-    add_header Cache-Control public;
-  }
-
-  try_files $uri/index.html $uri @puma;
-  location @puma {
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-    proxy_pass http://puma;
-  }
-
-  error_page 500 502 503 504 /500.html;
-  client_max_body_size 4G;
-  keepalive_timeout 10;
-}
-
-<% if fetch(:enable_ssl) %>
-server {
-  listen 443 default deferred;
-  root <%= fetch(:deploy_to) %>/current/public;
-
-  location ^~ /assets/ {
-    gzip_static on;
-    expires max;
-    add_header Cache-Control public;
-  }
-
-  try_files $uri/index.html $uri @puma;
-  location @puma {
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header   X-Forwarded-Proto https;
-    proxy_set_header Host $http_host;
-    proxy_redirect off;
-    proxy_pass http://puma;
-  }
-
-  error_page 500 502 503 504 /500.html;
-  client_max_body_size 4G;
-  keepalive_timeout 10;
-  ssl on;
-  ssl_certificate <%= fetch(:deploy_to) %>/shared/ssl_cert.crt;
-  ssl_certificate_key <%= fetch(:deploy_to) %>/shared/ssl_private_key.key;
-}#
-<% end %>

data/lib/generators/teleport/templates/capistrano/shared/puma.conf.erb

@@ -1 +0,0 @@
-<%= current_path %>,<%= fetch(:deploy_user) %>

data/lib/generators/teleport/templates/capistrano/shared/puma.erb

@@ -1,332 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          puma 
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Example initscript
-# Description:       This file should be used to construct scripts to be
-#                    placed in /etc/init.d.
-### END INIT INFO
-
-# Author: Darío Javier Cravero <dario@exordo.com>
-#
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/usr/local/bin:/usr/local/sbin/:/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Puma rack web server"
-NAME=puma
-DAEMON=$NAME
-SCRIPTNAME=/etc/init.d/$NAME
-CONFIG=/etc/puma.conf
-JUNGLE=`cat $CONFIG`
-RUNPUMA=/usr/local/bin/run-puma
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the jungle 
-#
-do_start() {
-  log_daemon_msg "=> Running the jungle..."
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    user=`echo $i | cut -d , -f 2`
-    config_file=`echo $i | cut -d , -f 3`
-    if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
-    log_file=`echo $i | cut -d , -f 4`
-    if [ "$log_file" = "" ]; then
-      log_file="$dir/log/puma.log"
-    fi
-    do_start_one $dir $user $config_file $log_file
-  done
-}
-
-do_start_one() {
-  PIDFILE=$1/tmp/puma/pid
-  if [ -e $PIDFILE ]; then
-    PID=`cat $PIDFILE`
-    # If the puma isn't running, run it, otherwise restart it.
-    if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      do_start_one_do $1 $2 $3 $4
-    else
-      do_restart_one $1
-    fi
-  else
-    do_start_one_do $1 $2 $3 $4
-  fi
-}
-
-do_start_one_do() {
-  log_daemon_msg "--> Woke up puma $1"
-  log_daemon_msg "user $2"
-  log_daemon_msg "log to $4"
-  start-stop-daemon --verbose --start --chdir $1 --chuid $2 --background --exec $RUNPUMA -- $1 $3 $4
-}
-
-#
-# Function that stops the jungle
-#
-do_stop() {
-  log_daemon_msg "=> Putting all the beasts to bed..."
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    do_stop_one $dir
-  done
-}
-#
-# Function that stops the daemon/service
-#
-do_stop_one() {
-  log_daemon_msg "--> Stopping $1"
-  PIDFILE=$1/tmp/puma/pid
-  STATEFILE=$1/tmp/puma/state
-  if [ -e $PIDFILE ]; then
-    PID=`cat $PIDFILE`
-    if [ "`ps -A -o pid= | grep -c $PID`" -eq 0 ]; then
-      log_daemon_msg "---> Puma $1 isn't running."
-    else
-      log_daemon_msg "---> About to kill PID `cat $PIDFILE`"
-      pumactl --state $STATEFILE stop
-      # Many daemons don't delete their pidfiles when they exit.
-      rm -f $PIDFILE $STATEFILE
-    fi
-  else
-    log_daemon_msg "---> No puma here..."
-  fi
-  return 0
-}
-
-#
-# Function that restarts the jungle 
-#
-do_restart() {
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    do_restart_one $dir
-  done
-}
-
-#
-# Function that sends a SIGUSR2 to the daemon/service
-#
-do_restart_one() {
-  PIDFILE=$1/tmp/puma/pid
-  i=`grep $1 $CONFIG`
-  dir=`echo $i | cut -d , -f 1`
-
-  if [ -e $PIDFILE ]; then
-    log_daemon_msg "--> About to restart puma $1"
-    pumactl --state $dir/tmp/puma/state restart
-    # kill -s USR2 `cat $PIDFILE`
-    # TODO Check if process exist
-  else
-    log_daemon_msg "--> Your puma was never playing... Let's get it out there first" 
-    user=`echo $i | cut -d , -f 2`
-    config_file=`echo $i | cut -d , -f 3`
-    if [ "$config_file" = "" ]; then
-      config_file="$dir/config/puma.rb"
-    fi
-    log_file=`echo $i | cut -d , -f 4`
-    if [ "$log_file" = "" ]; then
-      log_file="$dir/log/puma.log"
-    fi
-    do_start_one $dir $user $config_file $log_file
-  fi
-	return 0
-}
-
-#
-# Function that statuss the jungle 
-#
-do_status() {
-  for i in $JUNGLE; do
-    dir=`echo $i | cut -d , -f 1`
-    do_status_one $dir
-  done
-}
-
-#
-# Function that sends a SIGUSR2 to the daemon/service
-#
-do_status_one() {
-  PIDFILE=$1/tmp/puma/pid
-  i=`grep $1 $CONFIG`
-  dir=`echo $i | cut -d , -f 1`
-
-  if [ -e $PIDFILE ]; then
-    log_daemon_msg "--> About to status puma $1"
-    pumactl --state $dir/tmp/puma/state stats
-    # kill -s USR2 `cat $PIDFILE`
-    # TODO Check if process exist
-  else
-    log_daemon_msg "--> $1 isn't there :(..." 
-  fi
-	return 0
-}
-
-do_add() {
-  str=""
-  # App's directory
-  if [ -d "$1" ]; then
-    if [ "`grep -c "^$1" $CONFIG`" -eq 0 ]; then
-      str=$1
-    else
-      echo "The app is already being managed. Remove it if you want to update its config."
-      exit 1 
-    fi
-  else
-    echo "The directory $1 doesn't exist."
-    exit 1
-  fi
-  # User to run it as
-  if [ "`grep -c "^$2:" /etc/passwd`" -eq 0 ]; then
-    echo "The user $2 doesn't exist."
-    exit 1
-  else
-    str="$str,$2"
-  fi
-  # Config file
-  if [ "$3" != "" ]; then
-    if [ -e $3 ]; then
-      str="$str,$3"
-    else
-      echo "The config file $3 doesn't exist."
-      exit 1
-    fi
-  fi
-  # Log file
-  if [ "$4" != "" ]; then
-    str="$str,$4"
-  fi
-
-  # Add it to the jungle 
-  echo $str >> $CONFIG
-  log_daemon_msg "Added a Puma to the jungle: $str. You still have to start it though."
-}
-
-do_remove() {
-  if [ "`grep -c "^$1" $CONFIG`" -eq 0 ]; then
-    echo "There's no app $1 to remove."
-  else
-    # Stop it first.
-    do_stop_one $1
-    # Remove it from the config.
-    sed -i "\\:^$1:d" $CONFIG
-    log_daemon_msg "Removed a Puma from the jungle: $1."
-  fi
-}
-
-case "$1" in
-  start)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_start
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      user=`echo $i | cut -d , -f 2`
-      config_file=`echo $i | cut -d , -f 3`
-      if [ "$config_file" = "" ]; then
-        config_file="$dir/config/puma.rb"
-      fi
-      log_file=`echo $i | cut -d , -f 4`
-      if [ "$log_file" = "" ]; then
-        log_file="$dir/log/puma.log"
-      fi
-      do_start_one $dir $user $config_file $log_file
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  stop)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_stop
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      do_stop_one $dir
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  status)
-    # TODO Implement.
-    log_daemon_msg "Status $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_status
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      do_status_one $dir
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  restart)
-    log_daemon_msg "Restarting $DESC" "$NAME"
-    if [ "$#" -eq 1 ]; then
-      do_restart
-    else
-      i=`grep $2 $CONFIG`
-      dir=`echo $i | cut -d , -f 1`
-      do_restart_one $dir
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  add)
-    if [ "$#" -lt 3 ]; then
-      echo "Please, specifiy the app's directory and the user that will run it at least."
-      echo "  Usage: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
-      echo "    config and log are optionals."
-      exit 1
-    else
-      do_add $2 $3 $4 $5
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  remove)
-    if [ "$#" -lt 2 ]; then
-      echo "Please, specifiy the app's directory to remove."
-      exit 1
-    else
-      do_remove $2
-    fi
-    case "$?" in
-      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-    esac
-  ;;
-  *)
-    echo "Usage:" >&2
-    echo "  Run the jungle: $SCRIPTNAME {start|stop|status|restart}" >&2
-    echo "  Add a Puma: $SCRIPTNAME add /path/to/app user /path/to/app/config/puma.rb /path/to/app/config/log/puma.log"
-    echo "    config and log are optionals."
-    echo "  Remove a Puma: $SCRIPTNAME remove /path/to/app"
-    echo "  On a Puma: $SCRIPTNAME {start|stop|status|restart} PUMA-NAME" >&2
-    exit 3
-  ;;
-esac
-:

data/lib/generators/teleport/templates/capistrano/shared/puma.rb.erb

@@ -1,18 +0,0 @@
-workers Integer(ENV['PUMA_WORKERS'] || 3)
-threads Integer(ENV['MIN_THREADS']  || 1), Integer(ENV['MAX_THREADS'] || 16)
-
-preload_app!
-
-rackup      DefaultRackup
-port        ENV['PORT']     || 3000
-environment ENV['RACK_ENV'] || 'development'
-
-on_worker_boot do
-  # worker specific setup
-  ActiveSupport.on_load(:active_record) do
-    config = ActiveRecord::Base.configurations[Rails.env] ||
-                Rails.application.config.database_configuration[Rails.env]
-    config['pool'] = ENV['MAX_THREADS'] || 16
-    ActiveRecord::Base.establish_connection(config)
-  end
-end

data/lib/generators/teleport/templates/capistrano/shared/run-puma.erb

@@ -1,3 +0,0 @@
-#!/bin/bash
-app=$1; config=$2; log=$3;
-cd $app && exec bundle exec puma -C $config 2>&1 >> $log

data/lib/generators/teleport/templates/capistrano/shared/sidekiq.yml.erb

@@ -1,3 +0,0 @@
-concurrency: 1
-<%= fetch(:rails_env) %>:
-  pidfile: tmp/pids/sidekiq.pid