pixelforce_recipes 1.8 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f2bb680c8a781970d5d1889b4f7c3107242c8b3052ed4f07d896e76236307e
-  data.tar.gz: c41a8ae182ca17398dda97f95dbf70d9c9407b7f75ce78cc74ae8be994350f95
+  metadata.gz: 99cd84bf28bedffc49e0b17d0abadb17948931d83adfff7e4ea203085e846595
+  data.tar.gz: 5f29ecc95d3af1e4745ece64f81ea1412616b77efbf3e8809e7eb516186cb490
 SHA512:
-  metadata.gz: cfc18005e3be92d5699e4f0e31abf1bff6db288102c8e5694c2f1bde806df281725f4febde50fa01988bb56362eefdc52cb258386bdc1275431b137e1ebe7e6d
-  data.tar.gz: cc309a15f2b368d17903742bcbd1ee1a6f31bbf6011dcac72a1f0231c23ab27cec813d9302cb5a8315f0ff1999cddc1f368c5b7f675d26466f44b5ae1898e954
+  metadata.gz: e77266c598a308a077dac8cf13e8965171a3eda2ca41f8e055863303093f1bf3e58a34de975e2d3f6d05265f490e3b7cc451f149781ba87fa86d7da0902c9b62
+  data.tar.gz: 16bad33ad82245b2a4a9d33bea8eee1e2d1a2bc79337570656d34e0d90f2d2292b74699395a1c677b55cada6ce54dd43d59d0bfe8227d634d8f6e881ec1d329f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pixelforce_recipes (1.8)
+    pixelforce_recipes (2.4)
       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

@@ -4,9 +4,11 @@ namespace :puma do
   task :config do
     on roles(:web) do
       template "puma.rb.erb", "/tmp/puma_conf"
-      sudo "mv /tmp/puma_conf #{shared_path}/config"
+      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
@@ -28,11 +30,12 @@ namespace :puma do
       end
     end
   end
+
   namespace :supervisor do
     task :setup do
       on roles(:web) do
         template "puma_supervisor.erb", "/tmp/puma"
-        sudo "mv /tmp/puma /etc/supervisor/conf.d/#{fetch(:application)}"
+        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"

data/lib/pixelforce_recipes/capistrano_3_recipes/resque.rb

@@ -25,7 +25,7 @@ namespace :resque do
     task :setup do
       on roles(:resque) do
         template "resque_supervisor.erb", "/tmp/resque"
-        sudo "mv /tmp/resque /etc/supervisor/conf.d/resque"
+        sudo "mv /tmp/resque /etc/supervisor/conf.d/resque.conf"
         sudo "supervisorctl reread"
         sudo "supervisorctl update" # it will auto start the application
       end

data/lib/pixelforce_recipes/capistrano_3_recipes/resque_scheduler.rb

@@ -25,7 +25,7 @@ namespace :resque_scheduler do
     task :setup do
       on roles(:resque) do
         template "resque_scheduler_supervisor.erb", "/tmp/resque_scheduler"
-        sudo "mv /tmp/resque_scheduler /etc/supervisor/conf.d/resque_scheduler"
+        sudo "mv /tmp/resque_scheduler /etc/supervisor/conf.d/resque_scheduler.conf"
         sudo "supervisorctl reread"
         sudo "supervisorctl update" # it will auto start the application
       end

data/lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb

@@ -25,7 +25,7 @@ namespace :sidekiq do
     task :setup do
       on roles(:sidekiq) do
         template "sidekiq_supervisor.erb", "/tmp/sidekiq"
-        sudo "mv /tmp/sidekiq /etc/supervisor/conf.d/sidekiq"
+        sudo "mv /tmp/sidekiq /etc/supervisor/conf.d/sidekiq.conf"
         sudo "supervisorctl reread"
         sudo "supervisorctl update" # it will auto start the application
       end
@@ -39,5 +39,38 @@ namespace :sidekiq do
         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"
+      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:*"
+      end
+    end
+    task :rolling_restart_group do
+      desc "used for rolling restart, only available on enterprise version"
+      on roles(:sidekiq) do
+        execute "supervisorctl signal USR2 sidekiq:*"
+      end
+    end
   end
 end

data/lib/pixelforce_recipes/capistrano_3_recipes/unicorn.rb

@@ -26,7 +26,7 @@ namespace :unicorn do
     task :setup do
       on roles(:web) do
         template "unicorn_supervisor.erb", "/tmp/unicorn"
-        sudo "mv /tmp/unicorn /etc/supervisor/conf.d/#{fetch(:application)}"
+        sudo "mv /tmp/unicorn /etc/supervisor/conf.d/#{fetch(:application)}.conf"
         sudo "supervisorctl reread"
         sudo "supervisorctl update" # it will auto start the application
         template "nginx_config.erb", "/tmp/nginx_config"

data/lib/pixelforce_recipes/templates/logrotate.erb

@@ -1,8 +1,10 @@
 <%= fetch(:deploy_to) %>/shared/log/*.log {
-  daily
+  su deploy deploy
+  maxsize 1G
+  weekly
   missingok
   copytruncate
-  rotate 7
+  rotate 5
   compress
   notifempty
-}
+}

data/lib/pixelforce_recipes/templates/nginx_config.erb

@@ -15,6 +15,9 @@ server {
   }
 
   location @<%= fetch(:application) %> {
+    proxy_set_header   X-Forwarded-Proto $scheme;
+    proxy_set_header   X-Forwarded-Ssl on;
+    proxy_set_header   X-Forwarded-Port 443;
     proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header   Host $http_host;
     proxy_redirect     off;
@@ -26,4 +29,4 @@ server {
   error_page 500 502 503 504 /500.html;
   client_max_body_size 1G;
   keepalive_timeout 10;
-}
+}

data/lib/pixelforce_recipes/templates/nginx_puma_config.erb

@@ -7,10 +7,8 @@ server {
   server_name <%= fetch(:server_address) %>;
 
   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/ {
+  location ^~ /packs/ {
     gzip_static on;
     expires max;
     add_header Cache-Control public;
@@ -18,11 +16,16 @@ server {
 
   try_files $uri $uri @<%= fetch(:application) %>;
   location @<%= fetch(:application) %> {
+    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.rb.erb

@@ -1,18 +1,18 @@
 #!/usr/bin/env puma
 
 directory '<%= current_path %>'
-rackup "#{current_path}/config.ru"
+rackup '<%= current_path %>/config.ru'
 environment '<%= fetch(:rails_env, 'production') %>'
 tag '<%= fetch(:application)%>'
-pidfile "#{shared_path}/pids/puma.pid"
-state_path "#{shared_path}/pids/puma.state"
-stdout_redirect "#{shared_path}/log/puma_access.log", "#{shared_path}/log/puma_error.log", true
+pidfile '<%= shared_path %>/pids/puma.pid'
+state_path '<%= shared_path %>/pids/puma.state'
+stdout_redirect '<%= shared_path %>/log/<%= fetch(:application)%>.log', '<%= shared_path %>/log/<%= fetch(:application)%>.log', true
 
 threads <%= fetch(:puma_threads, [0, 1]).join(',')%>
 
-bind "unix:///tmp/<%= fetch(:application)%>.sock"
+bind 'unix:///tmp/<%= fetch(:application)%>.sock'
 
-activate_control_app "unix://#{shared_path}/tmp/sockets/pumactl.sock"
+activate_control_app 'unix://<%= shared_path %>/tmp/sockets/pumactl.sock'
 
 workers <%= fetch(:puma_workers, 2) %>
 
@@ -20,7 +20,7 @@ preload_app!
 
 on_restart do
   puts 'Refreshing Gemfile'
-  ENV["BUNDLE_GEMFILE"] = "<%= fetch(:bundle_gemfile, "#{current_path}/Gemfile") %>"
+  ENV['BUNDLE_GEMFILE'] = '<%= current_path %>/Gemfile'
 end
 
 before_fork do

data/lib/pixelforce_recipes/templates/puma_supervisor.erb

@@ -7,7 +7,7 @@ autostart=<%= fetch(:autostart, 'true') %>
 autorestart=<%= fetch(:autorestart, 'true') %>
 startsecs=5
 startretries=3
-stderr_logfile=<%= fetch(:deploy_to) %>/shared/log/puma.error.log
-stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/puma.access.log
+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') %>

data/lib/pixelforce_recipes/templates/resque_scheduler_supervisor.erb

@@ -5,6 +5,7 @@ directory=<%= fetch(:deploy_to) %>/current
 command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec rake RAILS_ENV=<%= fetch(:rails_env) %> QUEUE='*' environment resque:scheduler 2>&1 > <%= fetch(:deploy_to) %>/shared/log/resque_scheduler.log
 autostart=<%= fetch(:autostart, 'true') %>
 autorestart=<%= fetch(:autorestart, 'true') %>
+stopsignal=QUIT
 startsecs=5
 startretries=3
 stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/resque_scheduler.log

data/lib/pixelforce_recipes/templates/resque_supervisor.erb

@@ -5,6 +5,7 @@ directory=<%= fetch(:deploy_to) %>/current
 command=/home/<%= fetch(:user) %>/.rvm/bin/rvm <%= fetch(:rvm_ruby_version, '2.4.7') %> do bundle exec rake RAILS_ENV=<%= fetch(:rails_env) %> QUEUE=critical,default,mailers,low environment resque:work 2>&1 > <%= fetch(:deploy_to) %>/shared/log/resque.log
 autostart=<%= fetch(:autostart, 'true') %>
 autorestart=<%= fetch(:autorestart, 'true') %>
+stopsignal=QUIT
 startsecs=5
 startretries=3
 stdout_logfile=<%= fetch(:deploy_to) %>/shared/log/resque.log

data/lib/pixelforce_recipes/version.rb

@@ -1,3 +1,3 @@
 module PixelforceRecipes
-  VERSION = "1.8"
+  VERSION = "2.4"
 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: '1.8'
+  version: '2.4'
 platform: ruby
 authors:
 - Ben Zhang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ homepage: https://git.pixelforcesystems.com.au/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -134,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.
 test_files: []