pixelforce_recipes 2.3 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad9d77ec9bf9d8ffe4eabde0ee7813cd2d8f900584b2908cb628658bc93261a1
-  data.tar.gz: 37927ba6a5f7ebf744331a2e2f6829538db140eedce42ae118d6b0db82393249
+  metadata.gz: 7905038f3c5054c06689ee483a7b158ac72a334660b454b60052861002914673
+  data.tar.gz: c715817402a72a47b814c190fba4f30e437de3c08c70c4a089bdd8a78fecd1a5
 SHA512:
-  metadata.gz: b855a9ead01e7808631d853bbed9a278661439597910b97bd75b175bd7a4ff22fdbf9508a693669645ee2f7d38e2100b73ac9b151cc88a1fcc9d29a263407b2a
-  data.tar.gz: e244b96ca0385bf32fb349b0506728ac1c9bb41003e6a884aefd110fc7a2b7aff4d047631250d95236325d0c0226e0542df99f0bed2f71f97f9c6d2faf4a4016
+  metadata.gz: 50b57475792027bca4943499d209c1c8d61e5105a626aa33052811659f42ce80d53b58a30752813f3d9f2ac63548ece5cf3b3d157ab16dd4f1f1128de8d68c68
+  data.tar.gz: c23bf29502ee0bde6926139cc552a8babf80f534c82f2cfb99f7402f3dfb3a4c66065157cddd056f1e8cbe794c3c61fdb6870a2587b905c90a2eafcb03957449

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pixelforce_recipes (2.3)
+    pixelforce_recipes (3.1)
       capistrano (> 2.0.0)
 
 GEM
@@ -16,7 +16,7 @@ GEM
       sshkit (>= 1.9.0)
     concurrent-ruby (1.1.9)
     diff-lcs (1.2.5)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
@@ -43,10 +43,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
   pixelforce_recipes!
   rake (~> 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.2.10

data/lib/pixelforce_recipes/capistrano_3_recipes/puma.rb

@@ -1,66 +1,43 @@
 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
+  namespace :systemd 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)}"
+        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
 
-    %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
-    task :setup do
+    task :restart 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)}"
+        sudo 'systemctl restart puma'
       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
+    task :reload 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

@@ -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.3"
+  VERSION = "3.2"
 end

data/pixelforce_recipes.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Write a short summary, because Rubygems requires one.}
   spec.description   = %q{Write a longer description or delete this line.}
-  spec.homepage      = "https://git.pixelforcesystems.com.au/"
+  spec.homepage      = "https://github.com/BenZhang/pixelforce_recipes"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelforce_recipes
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: '3.2'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,20 +102,20 @@ 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
 - lib/pixelforce_recipes/version.rb
 - pixelforce_recipes.gemspec
-homepage: https://git.pixelforcesystems.com.au/
+homepage: https://github.com/BenZhang/pixelforce_recipes
 licenses:
 - MIT
 metadata: {}

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') %>