pixelforce_recipes 2.0 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc8944ed978b04a14ad148a608429564b240baf6c4aa0645e07c61879779b0f
-  data.tar.gz: 8470f58a2d5e1b4688ffecbeef0b6214bf910ba2c8bb8728ffd204b316e98437
+  metadata.gz: 56d761b88d6996453532e7b31d596541e7f53534b40df4d4b0cc9a3f075c9d1b
+  data.tar.gz: c6e5f42615c11b996da96e756eb38f856ad8c187612e2a4342c60838692090b4
 SHA512:
-  metadata.gz: bd84db64c8238e86f2d7715eb8c15f7123ca385436434b6ad2ca69c465ad29b164f4f8aa9f31bea2bbf05f432ee2b4e9c6bce8347fb5b36accb8d319babd6684
-  data.tar.gz: 181f1e7f3b8a0b5e7fb2ac10921e5132f56218a1663354e89c3cbbb327dd3c5ca155ea6a6c6450797bd48de560df312ccb32aaa49eba14e65c3bad2c8ad9298f
+  metadata.gz: 5f865dbea5c22b406f3b5743c849f4d2a7ac978a4562cda20e32d919e921baba492f65677cc19dc5b2698e7fc823275e8acd4ffdbaa56a1feab4067afe2f6f71
+  data.tar.gz: 0d601bbb122787ab19458dfee70738c0daecd97c7f26c4e42a6627ec9a0d389ed58f72a874d6ecd1ded62c7e8a168a1051e4715e3ee8d44cb85feaf181c74123

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pixelforce_recipes (1.8)
+    pixelforce_recipes (3.0)
       capistrano (> 2.0.0)
 
 GEM
@@ -9,18 +9,18 @@ GEM
   specs:
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    capistrano (3.12.0)
+    capistrano (3.16.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.2.5)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
     rake (13.0.1)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -35,7 +35,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sshkit (1.20.0)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
 
@@ -49,4 +49,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.16.6
+   1.17.3

data/lib/pixelforce_recipes/capistrano_3_recipes/puma.rb

@@ -1,63 +1,37 @@
 namespace :puma do
-
-  desc "Setup puma configuration for this application"
+  desc 'Setup puma configuration for this application'
   task :config do
     on roles(:web) do
-      template "puma.rb.erb", "/tmp/puma_conf"
+      template 'puma.rb.erb', '/tmp/puma_conf'
       sudo "mv /tmp/puma_conf #{shared_path}/config/puma.rb"
+      execute "mkdir -p #{shared_path}/pids"
     end
   end
-  namespace :sysvinit do
-    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 reload].each do |command|
-      desc "#{command} puma"
-      task command do
-        on roles(:web) do
-          execute "/etc/init.d/#{fetch(:application)} #{command}"
-        end
-      end
-    end
-  end
-  namespace :supervisor do
+  namespace :systemd do
     task :setup do
       on roles(:web) do
-        template "puma_supervisor.erb", "/tmp/puma"
-        sudo "mv /tmp/puma /etc/supervisor/conf.d/#{fetch(:application)}.conf"
-        sudo "supervisorctl reread"
-        sudo "supervisorctl update" # it will auto start the application
-        template "nginx_puma_config.erb", "/tmp/nginx_puma_config"
-        sudo "mv /tmp/nginx_puma_config /etc/nginx/sites-enabled/#{fetch(:application)}"
+        template 'puma_systemd.erb', '/tmp/puma.service'
+        sudo 'mv /tmp/puma.service /etc/systemd/system/puma.service'
+        sudo 'systemctl daemon-reload'
+        sudo 'systemctl enable puma.service'
+        sudo 'systemctl start puma.service'
       end
     end
 
-    task :start do
-      on roles(:web) do
-        execute "supervisorctl start #{fetch(:application)}"
-      end
-    end
-    task :stop do
-      on roles(:web) do
-        execute "supervisorctl signal INT #{fetch(:application)}"
-      end
-    end
     task :restart do
       on roles(:web) do
-        execute "supervisorctl signal USR1 #{fetch(:application)}"
+        sudo 'systemctl reload puma'
       end
     end
-    task :reload do
+  end
+
+  namespace :supervisor do
+    task :uninstall do
       on roles(:web) do
-        execute "supervisorctl signal USR2 #{fetch(:application)}"
+        sudo "rm /etc/supervisor/conf.d/#{fetch(:application)}.conf"
+        sudo "supervisorctl reread"
+        sudo "supervisorctl update"
       end
     end
   end

data/lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb

@@ -1,75 +1,36 @@
 namespace :sidekiq do
-  desc "Install sidekiq"
+  desc 'Install sidekiq'
 
-  desc "Setup sidekiq configuration for this application"
-  namespace :sysvinit do
+  namespace :systemd do
     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(:sidekiq) do
-          execute "/etc/init.d/sidekiq #{command}"
-        end
-      end
-    end 
-  end 
-  namespace :supervisor do
-    task :setup do
-      on roles(:sidekiq) do
-        template "sidekiq_supervisor.erb", "/tmp/sidekiq"
-        sudo "mv /tmp/sidekiq /etc/supervisor/conf.d/sidekiq.conf"
-        sudo "supervisorctl reread"
-        sudo "supervisorctl update" # it will auto start the application
+      on roles(:web) do
+        template 'sidekiq_systemd.erb', '/tmp/sidekiq.service'
+        sudo 'mv /tmp/sidekiq.service /etc/systemd/system/sidekiq.service'
+        sudo 'systemctl daemon-reload'
+        sudo 'systemctl enable sidekiq'
+        sudo 'systemctl start sidekiq'
       end
     end
 
-    %w[start stop restart].each do |command|
-      desc "#{command} sidekiq"
-      task command do
-        on roles(:sidekiq) do
-          execute "supervisorctl #{command} sidekiq"
-        end
-      end
-    end
     task :unload do
-      desc "tell sidekiq stop receive new jobs, called at the beginning"
-      on roles(:sidekiq) do
-        execute "supervisorctl signal TSTP sidekiq"
-      end
-    end
-    task :rolling_restart do
-      desc "used for rolling restart, only available on enterprise version"
-      on roles(:sidekiq) do
-        execute "supervisorctl signal USR2 sidekiq"
+      on roles(:web) do
+        sudo 'systemctl kill -s TSTP sidekiq'
       end
     end
 
-    %w[start_group stop_group restart_group].each do |command|
-      desc "#{command} sidekiq"
-      task command do
-        on roles(:sidekiq) do
-          execute "supervisorctl #{command.split('_')[0]} sidekiq:*"
-        end
-      end
-    end
-    task :unload_group do
-      desc "tell sidekiq stop receive new jobs, called at the beginning"
-      on roles(:sidekiq) do
-        execute "supervisorctl signal TSTP sidekiq:*"
+    task :restart do
+      on roles(:web) do
+        sudo 'systemctl restart sidekiq'
       end
     end
-    task :rolling_restart_group do
-      desc "used for rolling restart, only available on enterprise version"
+  end
+
+  namespace :supervisor do
+    task :uninstall do
       on roles(:sidekiq) do
-        execute "supervisorctl signal USR2 sidekiq:*"
+        sudo 'rm/etc/supervisor/conf.d/sidekiq.conf'
+        sudo 'supervisorctl reread'
+        sudo 'supervisorctl update'
       end
     end
   end

data/lib/pixelforce_recipes/templates/nginx_puma_config.erb

@@ -8,7 +8,7 @@ server {
 
   root <%= fetch(:deploy_to) %>/current/public;
 
-  location ^~ /assets/ {
+  location ^~ /packs/ {
     gzip_static on;
     expires max;
     add_header Cache-Control public;
@@ -16,12 +16,16 @@ server {
 
   try_files $uri $uri @<%= fetch(:application) %>;
   location @<%= fetch(:application) %> {
-    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_set_header X-Url-Scheme      https;
+    proxy_set_header X-Forwarded-Ssl   on;
+    proxy_set_header Front-End-Https   on;
+
     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_redirect   off;
+    proxy_buffering  on;
+    proxy_set_header X-Real-IP        $remote_addr;
 
     proxy_pass http://<%= fetch(:application) %>;
   }

data/lib/pixelforce_recipes/templates/puma_systemd.erb

@@ -0,0 +1,19 @@
+[Unit]
+Description=Puma HTTP Server
+After=network.target
+
+[Service]
+Type=simple
+User=<%= fetch(:user) %>
+WorkingDirectory=<%= fetch(:deploy_to) %>/current
+
+# Helpful for debugging socket activation, etc.
+# Environment=PUMA_DEBUG=1
+
+ExecStart=/bin/bash -l -c 'bundle exec puma -C <%= fetch(:deploy_to) %>/shared/config/puma.rb -e <%= fetch(:rails_env) %>'
+ExecStop=/bin/bash -l -c 'bundle exec pumactl -F <%= fetch(:deploy_to) %>/shared/config/puma.rb stop'
+ExecReload=/bin/bash -l -c 'bundle exec pumactl -F <%= fetch(:deploy_to) %>/shared/config/puma.rb phased-restart'
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

data/lib/pixelforce_recipes/templates/sidekiq_systemd.erb

@@ -0,0 +1,17 @@
+[Unit]
+Description=Sidekiq Background Process
+After=syslog.target network.target
+
+[Service]
+Type=simple
+User=<%= fetch(:user) %>
+WorkingDirectory=<%= fetch(:deploy_to) %>/current
+
+# Helpful for debugging socket activation, etc.
+Environment=MALLOC_ARENA_MAX=2
+
+ExecStart=/bin/bash -l -c 'bundle exec sidekiq -L <%= fetch(:deploy_to) %>/shared/log/sidekiq.log -e <%= fetch(:rails_env) %>'
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

data/lib/pixelforce_recipes/version.rb

@@ -1,3 +1,3 @@
 module PixelforceRecipes
-  VERSION = "2.0"
+  VERSION = "3.0"
 end

data/lib/pixelforce_recipes.rb

@@ -3,19 +3,8 @@ require "capistrano"
 
 if defined?(Capistrano::VERSION)
   if 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/resque_scheduler")
-    require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/supervisor")
-    require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/unicorn")
-    require File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/puma")
+    Dir[File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/capistrano_3_recipes/*.rb")].each {|file| require file }    
   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")
+    Dir[File.expand_path("#{File.dirname(__FILE__)}/pixelforce_recipes/legacy_recipes/*.rb")].each {|file| require file }    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_recipes
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '3.0'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-26 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,14 +102,14 @@ files:
 - lib/pixelforce_recipes/templates/nginx_config.erb
 - lib/pixelforce_recipes/templates/nginx_puma_config.erb
 - lib/pixelforce_recipes/templates/puma.rb.erb
-- lib/pixelforce_recipes/templates/puma_init.erb
-- lib/pixelforce_recipes/templates/puma_supervisor.erb
+- lib/pixelforce_recipes/templates/puma_systemd.erb
 - lib/pixelforce_recipes/templates/resque_init.erb
 - lib/pixelforce_recipes/templates/resque_scheduler_init.erb
 - lib/pixelforce_recipes/templates/resque_scheduler_supervisor.erb
 - lib/pixelforce_recipes/templates/resque_supervisor.erb
 - lib/pixelforce_recipes/templates/sidekiq_init.erb
 - lib/pixelforce_recipes/templates/sidekiq_supervisor.erb
+- lib/pixelforce_recipes/templates/sidekiq_systemd.erb
 - lib/pixelforce_recipes/templates/supervisor.erb
 - lib/pixelforce_recipes/templates/unicorn_init.erb
 - lib/pixelforce_recipes/templates/unicorn_supervisor.erb

data/lib/pixelforce_recipes/templates/puma_init.erb

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-### BEGIN INIT INFO
-# 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
-# Default-Stop:      0 1 6
-# Short-Description: starts the puma web server
-# Description:       starts puma
-### END INIT INFO
-
-USER="<%= fetch(:user) %>"
-DAEMON=puma
-PROJECT_PATH="<%= fetch(:deploy_to) %>"
-DAEMON_OPTS="-C $PROJECT_PATH/shared/config/puma.rb -e <%= fetch(:rails_env) %> -d"
-NAME=puma
-DESC="puma app for $USER"
-PID="$PROJECT_PATH/shared/pids/puma.pid"
-
-case "$1" in
-  start)
-        CD_TO_APP_DIR="cd $PROJECT_PATH/current"
-        START_DAEMON_PROCESS="bundle exec $DAEMON $DAEMON_OPTS"
-
-        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
-        fi
-        echo "$NAME."
-        ;;
-  stop)
-        echo -n "Stopping $DESC: "
-        kill -INT `cat $PID`
-        echo "$NAME."
-        ;;
-  restart)
-        echo -n "Restarting $DESC: "
-        kill -USR1 `cat $PID`
-        echo "$NAME."
-        ;;
-  reload)
-        echo -n "Reloading $DESC configuration: "
-        kill -USR2 `cat $PID`
-        echo "$NAME."
-        ;;
-  *)
-        echo "Usage: $NAME {start|stop|restart|reload}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0

data/lib/pixelforce_recipes/templates/puma_supervisor.erb

@@ -1,13 +0,0 @@
-[program:<%= fetch(:application) %>]
-user=<%= fetch(:user) %>
-environment=HOME="/home/<%= fetch(:user) %>",USER="<%= fetch(:user) %>"
-directory=<%= fetch(:deploy_to) %>/current
-command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec puma -C <%= fetch(:deploy_to) %>/shared/config/puma.rb -e <%= fetch(:rails_env) %>
-autostart=<%= fetch(:autostart, 'true') %>
-autorestart=<%= fetch(:autorestart, 'true') %>
-startsecs=5
-startretries=3
-stderr_logfile=<%= fetch(:deploy_to) %>/shared/log/<%= fetch(:application) %>.log
-stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/<%= fetch(:rails_env) %>.log
-stdout_logfile_maxbytes=<%= fetch(:logfile_maxbytes, '5GB') %>
-stdout_logfile_backups=<%= fetch(:logfile_backups, '10') %>