pixelforce_recipes 3.8 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ac5d73139a1d06f05d13662224fcc733946bc496dc95181e0ce23a9d12a0e0c
-  data.tar.gz: 2af497f3eaf47a9b72a72513f9a049d76faa5c3fb900226c6ff3ca49b89cce5d
+  metadata.gz: a764d72cb9b7327a363e11a1d7072a024210e7b1982caf2b1f250947ba9247f5
+  data.tar.gz: b6b145951cabd3a24d6f8b5fcabd40d9f5113855d2278554a89ed8b4a7bd7f63
 SHA512:
-  metadata.gz: b7e95f0e437b2a350a3b38ffb9c151a8b04432021be31a03860ba09ad7cf6ea0ec6c879c3341d5f548ebca90986ff6f17cafbb0f5d167a5cc7c941de4802399e
-  data.tar.gz: 9126291489081e9dadca52ee3f671e8995f173ae39b8decad2b7547463e0b0f6657b18542f66b2fb579e693fe3952bcb677b05bf9e43f29bf9031cf216bd0fbf
+  metadata.gz: 022a8ee0b5db8f7e1b75cf9f5c7b3dc11492fd72bd5acc6d94ea4826543a5310996c97f62a5a7e491291b169fb57f0ad4c3417dc2c83eb373fd57546cb8c1bb1
+  data.tar.gz: e958d348959954184ee4e85e9d6e9e1a7dc20b0bc5b01a8b7d401a082638709a137c9731c5bfcf989f0d1baf73d07d7c5cdb15f1fc750e5f77f7664168b706f1

data/Gemfile.lock

@@ -1,26 +1,46 @@
 PATH
   remote: .
   specs:
-    pixelforce_recipes (3.1)
+    pixelforce_recipes (3.9.2)
       capistrano (> 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.4.0)
+    airbrussh (1.4.1)
       sshkit (>= 1.6.1, != 1.7.0)
-    capistrano (3.16.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.628.0)
+    aws-sdk-autoscaling (1.80.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.145.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.525.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-ec2 (1.331.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.5.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+    capistrano (3.17.1)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.2.5)
-    i18n (1.8.11)
+    elbas (3.0.4)
+      aws-sdk-autoscaling (~> 1)
+      aws-sdk-ec2 (~> 1)
+      capistrano (> 3)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
+    jmespath (1.6.1)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (7.0.1)
     rake (13.0.1)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
@@ -35,7 +55,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sshkit (1.21.2)
+    sshkit (1.21.3)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
 
@@ -43,6 +63,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (~> 2.1)
+  elbas
   pixelforce_recipes!
   rake (~> 13.0)
   rspec (~> 3.0)

data/lib/pixelforce_recipes/capistrano_3_recipes/elbas.rb

@@ -1,7 +1,7 @@
 namespace :elbas do
   desc 'Sync files before creating AMI'
   task :sync do
-    on roles(:web) do
+    on roles(:app) do
       execute "sync"
     end
   end

data/lib/pixelforce_recipes/capistrano_3_recipes/logrotate.rb

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

data/lib/pixelforce_recipes/capistrano_3_recipes/puma.rb

@@ -42,26 +42,5 @@ namespace :puma do
         sudo 'supervisorctl update'
       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)}"
-      end
-    end
-    task :reload do
-      on roles(:web) do
-        execute "supervisorctl signal USR2 #{fetch(:application)}"
-      end
-    end
   end
 end

data/lib/pixelforce_recipes/capistrano_3_recipes/sidekiq.rb

@@ -3,7 +3,7 @@ namespace :sidekiq do
 
   namespace :systemd do
     task :setup do
-      on roles(:web) do
+      on roles(:app) do
         template 'sidekiq_systemd.erb', '/tmp/sidekiq.service'
         sudo 'mv /tmp/sidekiq.service /etc/systemd/system/sidekiq.service'
         sudo 'systemctl daemon-reload'
@@ -13,13 +13,13 @@ namespace :sidekiq do
     end
 
     task :unload do
-      on roles(:web) do
+      on roles(:app) do
         sudo 'systemctl kill -s TSTP sidekiq'
       end
     end
 
     task :restart do
-      on roles(:web) do
+      on roles(:app) do
         sudo 'systemctl restart sidekiq'
       end
     end
@@ -33,5 +33,56 @@ namespace :sidekiq do
         sudo 'supervisorctl update'
       end
     end
+
+    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
+      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"
+      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/templates/logrotate.erb

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

data/lib/pixelforce_recipes/version.rb

@@ -1,3 +1,3 @@
 module PixelforceRecipes
-  VERSION = '3.8'
+  VERSION = '3.9.2'
 end

data/pixelforce_recipes.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "elbas"
   spec.add_dependency(%q<capistrano>, ["> 2.0.0"])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_recipes
 version: !ruby/object:Gem::Version
-  version: '3.8'
+  version: 3.9.2
 platform: ruby
 authors:
 - Ben Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: elbas
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Write a short summary, because Rubygems requires one.