pixelforce_recipes 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd385481ab023261fb23d322e538df46a8ce209
-  data.tar.gz: d19e58b2983804ce31d6f12630adaf34db0a1230
+  metadata.gz: 4b5e21e690c3f0a6ef398cf285f22ff5e9c652d3
+  data.tar.gz: c415d1d498cdbe3684460c73dd4298efe4785334
 SHA512:
-  metadata.gz: f577ee0e574faec11bbb6aad1c873f1003ad74d2e2eef5eeadfab9614c15906d2f79ecc81468cbf1f51c840b9a8f2ae561d1a747f2f3e72232e40dd145a76f92
-  data.tar.gz: 0883dd4c4dc3263aeb6020da0035ae9d91519729c6371865c0b43eb4a53f85aa90fe8b7a2753761a7acca52ba6eefb31f97bdc19b59de981ab7982ac81de3dc1
+  metadata.gz: 68d3980743a9b71969e2ce5339eb8417e26bc3b9c30ab4ccda765c74cd1c5acfe9708032cbbf287215ad016c6abe4e719792592e30527ce92629e3aaba37736c
+  data.tar.gz: e27fa4ca1a0ebc01467b18417351961f2e4dcd70c471e8321f4f23eb4571aa0a7dbe978b496e50c5e75f66cc408818cbc14b8a66eea455ad741e2dd83ce5896a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pixelforce_recipes (1.3)
+    pixelforce_recipes (1.4)
       capistrano (> 2.0.0)
 
 GEM
@@ -14,9 +14,9 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.3)
     diff-lcs (1.2.5)
-    i18n (1.0.1)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)

data/lib/pixelforce_recipes.rb

@@ -1,8 +1,16 @@
 require "pixelforce_recipes/version"
 require "capistrano"
 
-require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/base")
-require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/unicorn")
-require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/sidekiq")
-require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/puma")
-require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/logrotate")
+if defined?(Capistrano::VERSION) && Capistrano::VERSION.to_s.split('.').first.to_i >= 3
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/base")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/sidekiq")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/resque")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/logrotate")
+else
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/base")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/unicorn")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/sidekiq")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/resque")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/puma")
+  require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/logrotate")
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/base.rb

@@ -0,0 +1,4 @@
+def template(from, to)
+  erb = File.read(File.expand_path("../../templates/#{from}", __FILE__))
+  upload! StringIO.new(ERB.new(erb).result(binding)), to
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/logrotate.rb

@@ -0,0 +1,9 @@
+namespace :logrotate do
+  desc "Setup logrotate configuration for this application"
+  task :setup do
+    on roles(:app) do
+      template "logrotate.erb", "/tmp/logrotate"
+      sudo "mv /tmp/logrotate /etc/logrotate.d/#{fetch(:application)}"
+    end
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/puma.rb

@@ -0,0 +1,23 @@
+namespace :puma do
+
+  desc "Setup puma configuration for this application"
+  task :setup do
+    on roles(:web) do
+      template "puma_init.erb", "/tmp/puma"
+      sudo "mv /tmp/puma /etc/init.d/#{fetch(:application)}"
+      sudo "chmod +x /etc/init.d/#{fetch(:application)}"
+      sudo "update-rc.d #{fetch(:application)} defaults"
+      template "nginx_puma_config.erb", "/tmp/nginx_puma_config"
+      sudo "mv /tmp/nginx_puma_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+    end
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command} puma"
+    task command do
+      on roles(:web) do
+        execute "/etc/init.d/#{fetch(:application)} #{command}"
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/resque.rb

@@ -0,0 +1,22 @@
+namespace :resque do
+  desc "Install resque"
+
+  desc "Setup resque configuration for this application"
+  task :setup do
+    on roles(:resque) do
+      template "resque_init.erb", "/tmp/resque"
+      sudo "mv /tmp/resque /etc/init.d/resque"
+      sudo "chmod +x /etc/init.d/resque"
+      sudo "update-rc.d resque defaults"
+    end
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command} resque"
+    task command do
+      on roles(:resque) do
+        execute "/etc/init.d/resque #{command}"
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb

@@ -0,0 +1,22 @@
+namespace :sidekiq do
+  desc "Install sidekiq"
+
+  desc "Setup sidekiq configuration for this application"
+  task :setup do
+    on roles(:sidekiq) do
+      template "sidekiq_init.erb", "/tmp/sidekiq"
+      sudo "mv /tmp/sidekiq /etc/init.d/sidekiq"
+      sudo "chmod +x /etc/init.d/sidekiq"
+      sudo "update-rc.d sidekiq defaults"
+    end
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command} sidekiq"
+    task command do
+      on roles(:resque) do
+        execute "/etc/init.d/sidekiq #{command}"
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/capistrano_3_recipes/unicorn.rb

@@ -0,0 +1,24 @@
+namespace :unicorn do
+  desc "Install unicorn"
+
+  desc "Setup unicorn configuration for this application"
+  task :setup do
+    on roles(:web) do
+      template "unicorn_init.erb", "/tmp/unicorn"
+      sudo "mv /tmp/unicorn /etc/init.d/#{fetch(:application)}"
+      sudo "chmod +x /etc/init.d/#{fetch(:application)}"
+      sudo "update-rc.d #{fetch(:application)} defaults"
+      template "nginx_config.erb", "/tmp/nginx_config"
+      sudo "mv /tmp/nginx_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+    end
+  end
+
+  %w[start stop restart].each do |command|
+    desc "#{command} unicorn"
+    task command do
+      on roles(:web) do
+        execute "/etc/init.d/#{fetch(:application)} #{command}"
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/legacy_recipes/resque.rb

@@ -0,0 +1,22 @@
+if Capistrano::Configuration.instance(false)
+  Capistrano::Configuration.instance(true).load do |instance|
+    namespace :resque do
+      desc "Install resque"
+
+      desc "Setup resque configuration for this application"
+      task :setup, roles: :resque do
+        template "resque_init.erb", "/tmp/resque"
+        run "#{sudo} mv /tmp/resque /etc/init.d/resque"
+        run "#{sudo} chmod +x /etc/init.d/resque"
+        run "#{sudo} update-rc.d resque defaults"
+      end
+
+      %w[start stop restart].each do |command|
+        desc "#{command} resque"
+        task command do
+          run "/etc/init.d/resque #{command}"
+        end
+      end
+    end
+  end
+end

data/lib/pixelforce_recipes/templates/logrotate.erb

@@ -1,4 +1,4 @@
-<%= deploy_to %>/shared/log/*.log {
+<%= fetch(:deploy_to) %>/shared/log/*.log {
   daily
   missingok
   copytruncate

data/lib/pixelforce_recipes/templates/nginx_config.erb

@@ -1,26 +1,26 @@
-upstream <%= application %> {
-  server unix:/tmp/<%= application %>.sock fail_timeout=0;
+upstream <%= fetch(:application) %> {
+  server unix:/tmp/<%= fetch(:application) %>.sock fail_timeout=0;
 }
 
 server {
   listen 80;
-  server_name <%= server_address %>;
-  root <%= deploy_to %>/current/public;
+  server_name <%= fetch(:server_address) %>;
+  root <%= fetch(:deploy_to) %>/current/public;
 
-  try_files $uri/index.html $uri @<%= application %>;
+  try_files $uri/index.html $uri @<%= fetch(:application) %>;
 
   location ~* ^(/assets|/favicon.ico) {
     access_log        off;
     expires           max;
   }
 
-  location @<%= application %> {
+  location @<%= fetch(:application) %> {
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header   Host $http_host;
     proxy_redirect     off;
     proxy_buffering    on;
     proxy_set_header   X-Real-IP        $remote_addr;
-    proxy_pass         http://<%= application %>;
+    proxy_pass         http://<%= fetch(:application) %>;
   }
 
   error_page 500 502 503 504 /500.html;

data/lib/pixelforce_recipes/templates/nginx_puma_config.erb

@@ -1,14 +1,14 @@
-upstream <%= application %> {
-  server unix:/tmp/<%= application %>.sock fail_timeout=0;
+upstream <%= fetch(:application) %> {
+  server unix:/tmp/<%= fetch(:application) %>.sock fail_timeout=0;
 }
 
 server {
   listen 80 default_server deferred;
-  server_name <%= server_address %>;
+  server_name <%= fetch(:server_address) %>;
 
-  root <%= deploy_to %>/current/public;
-  access_log <%= deploy_to %>/current/log/nginx.access.log;
-  error_log <%= deploy_to %>/current/log/nginx.error.log info;
+  root <%= fetch(:deploy_to) %>/current/public;
+  access_log <%= fetch(:deploy_to) %>/current/log/nginx.access.log;
+  error_log <%= fetch(:deploy_to) %>/current/log/nginx.error.log info;
 
   location ^~ /assets/ {
     gzip_static on;
@@ -16,19 +16,19 @@ server {
     add_header Cache-Control public;
   }
 
-  try_files $uri $uri @<%= application %>;
-  location @<%= application %> {
+  try_files $uri $uri @<%= fetch(:application) %>;
+  location @<%= fetch(:application) %> {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header Host $http_host;
     proxy_redirect off;
     proxy_buffering    on;
     proxy_set_header   X-Real-IP        $remote_addr;
 
-    proxy_pass http://<%= application %>;
+    proxy_pass http://<%= fetch(:application) %>;
   }
 
   location /cable {
-    proxy_pass http://<%= application %>;
+    proxy_pass http://<%= fetch(:application) %>;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";

data/lib/pixelforce_recipes/templates/puma_init.erb

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ### BEGIN INIT INFO
-# Provides:          <%= application %>
+# Provides:          <%= fetch(:application) %>
 # Required-Start:    $local_fs $remote_fs $network $syslog
 # Required-Stop:     $local_fs $remote_fs $network $syslog
 # Default-Start:     2 3 4 5
@@ -10,10 +10,10 @@
 # Description:       starts puma
 ### END INIT INFO
 
-USER="<%= user %>"
+USER="<%= fetch(:user) %>"
 DAEMON=puma
-PROJECT_PATH="<%= deploy_to %>"
-DAEMON_OPTS="-e <%= rails_env %>"
+PROJECT_PATH="<%= fetch(:deploy_to) %>"
+DAEMON_OPTS="-e <%= fetch(:rails_env) %>"
 NAME=puma
 DESC="puma app for $USER"
 PID="$PROJECT_PATH/shared/pids/puma.pid"

data/lib/pixelforce_recipes/templates/resque_init.erb

@@ -0,0 +1,49 @@
+#!/bin/bash
+
+### BEGIN INIT INFO
+# Provides:          resque
+# Required-Start:    $local_fs $remote_fs $network $syslog
+# Required-Stop:     $local_fs $remote_fs $network $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: resque worker via init.d
+# Description:       starts resque
+### END INIT INFO
+
+USER="deploy"
+PROJECT_PATH="<%= fetch(:deploy_to) %>"
+NAME=resque
+DESC="Resque app for $USER"
+PID="$PROJECT_PATH/shared/pids/resque.pid"
+LOGFILE="$PROJECT_PATH/shared/log/resque.log"
+CD_TO_APP_DIR="cd $PROJECT_PATH/current"
+
+
+case "$1" in
+  start)
+        START_DAEMON_PROCESS="bundle exec rake RAILS_ENV=<%= fetch(:rails_env) %> QUEUE='*' PIDFILE=$PID BACKGROUND=yes environment resque:work 2>&1 > $LOGFILE"
+        echo -n "Starting $DESC: "
+        if [ `whoami` = 'root' ]; then
+          su - $USER -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
+        else
+          /bin/bash -l -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
+        fi
+        echo "$NAME."
+        ;;
+  stop)
+        STOP_DAEMON_PROCESS="test -f $PID && kill -s QUIT `cat $PID` && rm -f $PID"
+        echo -n "Stopping $DESC: "
+        if [ `whoami` = 'root' ]; then
+          su - $USER -c "$CD_TO_APP_DIR && $STOP_DAEMON_PROCESS"
+        else
+          /bin/bash -l -c "$CD_TO_APP_DIR && $STOP_DAEMON_PROCESS"
+        fi
+        echo "$NAME."
+        ;;
+  *)
+        echo "Usage: $NAME {start|stop|restart|reload}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0

data/lib/pixelforce_recipes/templates/sidekiq_init.erb

@@ -12,7 +12,7 @@
 
 USER="deploy"
 DAEMON=sidekiq
-PROJECT_PATH="<%= deploy_to %>"
+PROJECT_PATH="<%= fetch(:deploy_to) %>"
 NAME=sidekiq
 DESC="Sidekiq app for $USER"
 PID="$PROJECT_PATH/shared/pids/sidekiq.pid"
@@ -21,13 +21,13 @@ CD_TO_APP_DIR="cd $PROJECT_PATH/current"
 
 case "$1" in
   start)
-        START_DAEMON_PROCESS="bundle exec sidekiq -d -e <%= rails_env %> -L $LOGFILE -P $PID"
+        START_DAEMON_PROCESS="bundle exec sidekiq -d -e <%= fetch(:rails_env) %> -L $LOGFILE -P $PID"
 
         echo -n "Starting $DESC: "
         if [ `whoami` = 'root' ]; then
           su - $USER -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
         else
-          $CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS
+          /bin/bash -l -c "$CD_TO_APP_DIR > /dev/null 2>&1 && $START_DAEMON_PROCESS"
         fi
         echo "$NAME."
         ;;

data/lib/pixelforce_recipes/templates/unicorn_init.erb

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ### BEGIN INIT INFO
-# Provides:          <%= application %>
+# Provides:          <%= fetch(:application) %>
 # Required-Start:    $local_fs $remote_fs $network $syslog
 # Required-Stop:     $local_fs $remote_fs $network $syslog
 # Default-Start:     2 3 4 5
@@ -10,10 +10,10 @@
 # Description:       starts unicorn
 ### END INIT INFO
 
-USER="<%= user %>"
+USER="<%= fetch(:user) %>"
 DAEMON=unicorn
-PROJECT_PATH="<%= deploy_to %>"
-DAEMON_OPTS="-c $PROJECT_PATH/current/config/unicorn.rb -E <%= rails_env %> -D"
+PROJECT_PATH="<%= fetch(:deploy_to) %>"
+DAEMON_OPTS="-c $PROJECT_PATH/current/config/unicorn.rb -E <%= fetch(:rails_env) %> -D"
 NAME=unicorn
 DESC="Unicorn app for $USER"
 PID="$PROJECT_PATH/shared/pids/unicorn.pid"

data/lib/pixelforce_recipes/version.rb

@@ -1,3 +1,3 @@
 module PixelforceRecipes
-  VERSION = "1.3"
+  VERSION = "1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_recipes
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,17 +83,25 @@ files:
 - bin/console
 - bin/setup
 - lib/pixelforce_recipes.rb
-- lib/pixelforce_recipes/base.rb
-- lib/pixelforce_recipes/logrotate.rb
-- lib/pixelforce_recipes/puma.rb
-- lib/pixelforce_recipes/sidekiq.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/base.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/logrotate.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/puma.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/resque.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb
+- lib/pixelforce_recipes/capistrano_3_recipes/unicorn.rb
+- lib/pixelforce_recipes/legacy_recipes/base.rb
+- lib/pixelforce_recipes/legacy_recipes/logrotate.rb
+- lib/pixelforce_recipes/legacy_recipes/puma.rb
+- lib/pixelforce_recipes/legacy_recipes/resque.rb
+- lib/pixelforce_recipes/legacy_recipes/sidekiq.rb
+- lib/pixelforce_recipes/legacy_recipes/unicorn.rb
 - lib/pixelforce_recipes/templates/logrotate.erb
 - lib/pixelforce_recipes/templates/nginx_config.erb
 - lib/pixelforce_recipes/templates/nginx_puma_config.erb
 - lib/pixelforce_recipes/templates/puma_init.erb
+- lib/pixelforce_recipes/templates/resque_init.erb
 - lib/pixelforce_recipes/templates/sidekiq_init.erb
 - lib/pixelforce_recipes/templates/unicorn_init.erb
-- lib/pixelforce_recipes/unicorn.rb
 - lib/pixelforce_recipes/version.rb
 - pixelforce_recipes.gemspec
 homepage: https://git.pixelforcesystems.com.au/