magic_recipes_two 0.0.80 → 0.0.81

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTExOWUyMjc2OWRhNTBhOGZjNzY5OWY1NTJjMmE4ZTA5YTIwNGM1Yw==
+    ZWNmMTE5MDFiYzhmYWNiNTY0Y2I1NjVkZTZkNTY1NmQzY2UwNzRkNQ==
   data.tar.gz: !binary |-
-    ZGE1MzkyYmQxNmFmNDk5NzllZjBmMDRhMWQ5NjhjOThhMjc3NjBmYw==
+    MzlhOTk5Mjc1ZDY4OThkODQyYmQzODAxZmE4ZWM3NTJjNjRmMjdkYw==
 SHA512:
   metadata.gz: !binary |-
-    MDdhZTc5Y2VlNGEyNDQ1MDNhMzkzMzdiYzYzYzhmNGFlZGE3Y2UyYzBhMDQ3
-    MDFkMTU3YmQ4ZTI0NjE3YzUyZjY1NTM5MDY5ZThiMWI3ZDExNDJhZGRmMGU2
-    OTVkZGRiZDU0N2UzMGRkZWQ4NjRjNzY2MjE1YmQyZjUxMmIyZTk=
+    ODNkY2FkMzA0Mzg2NTQ1N2RhNmFlYmU1YjZmZjUyNzU4NzIxNTM2MDE3NzBj
+    OGI2MjQ2MDYxY2YwZDg1MjIxOWUzMDg1ZDEyYjU0MzJlMTBhYjVhNGFlZDBl
+    ZTcwMWNmZmI5NTU0ZWM0M2EzYTZiY2I4ZmRlMDYxYmRlYTE2NTQ=
   data.tar.gz: !binary |-
-    YjFiZDhjYmFjNjY4NDExNDNhOWYzZDlkY2YxNTQ0OTIzYTBkNGY0M2I4MjQy
-    NWQ4Y2M2NzM2MWY4YzRkM2ZmN2ExZGM2YjhmN2FhNTExOTQ1MGFlODMxYjI2
-    MTc0MzhlNTA3YjhmNDQ0NDIyYzFjNzNhNjQzNDhlYmY1YjQxNzU=
+    OWM5MzE4ZDk2ZmI0MzM1MjRkYjdkYjA5ZDllYzUxMTQ3N2I5OTFhOTgxMWU4
+    OGI5MjAxNjFjYjRhZTU2ZmQ5OGE5NjYyODBjMWVjMDQ3YWMxNWFhMjg4Yzlm
+    NmEwNzliNzY3MDFlODMzMmZjNGRjNzFlNGE0NmJiMTc5OTgwYzU=

data/lib/capistrano/magic_recipes/pwa.rb

@@ -0,0 +1 @@
+load File.expand_path("../../tasks/pwa.rake", __FILE__)

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.80"
+    VERSION = "0.0.81"
   end
 end

data/lib/capistrano/tasks/lets_encrypt.rake

@@ -89,6 +89,15 @@ namespace :lets_encrypt do
     end
   end
   
+  
+  desc "Generate LetsEncrypt certificate + expand"
+  task :certonly_expand do
+    on release_roles fetch(:lets_encrypt_roles) do
+      # execute "./certbot-auto certonly --webroot -w /var/www/example -d example.com -d www.example.com -w /var/www/thing -d thing.is -d m.thing.is"
+      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{current_path}/public #{ Array(fetch(:lets_encrypt_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, "")}#{ fetch(:lets_encrypt__www_domains,false) ? " -d www.#{d.gsub(/^\*?\./, "")}" : "" }" }.join(" ") } --expand"
+    end
+  end
+  
 end
 
 

data/lib/capistrano/tasks/monit.rake

@@ -10,6 +10,7 @@ namespace :load do
     set :monit_logfile,               -> { "#{shared_path}/log/monit.log" }
     set :monit_idfile,                -> { '/var/lib/monit/id' }
     set :monit_statefile,             -> { '/var/lib/monit/state' }
+    set :monit_downgrade_on_deploy,   -> { false }
     ## Status
     set :monit_active,                -> { true }
     # set :monit_processes,             -> { %w[nginx postgresql redis sidekiq thin website] }
@@ -87,6 +88,12 @@ namespace :monit do
   end
   # after "deploy:setup", "monit:setup"
   
+  desc 'Downgrade MONIT to 5.16 (fix action problem)'
+  task :downgrade_system do
+    on roles :db do
+      execute :sudo, 'apt-get -y install monit=1:5.16-2 --allow-downgrades'
+    end
+  end
   
   %w[nginx postgresql redis sidekiq thin].each do |process|
       
@@ -199,6 +206,7 @@ end
 
 namespace :deploy do
   before :starting, :stop_monitoring do
+    invoke "monit:downgrade_system" if fetch(:monit_downgrade_on_deploy, false)
     %w[sidekiq thin].each do |command|
       if fetch(:monit_active) && Array(fetch(:monit_processes)).include?(command)
         invoke "monit:unmonitor_#{command}"

data/lib/capistrano/tasks/nginx.rake

@@ -122,6 +122,37 @@ namespace :nginx do
       puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
     end
   end
+  
+  
+  desc "check nginx service status"
+  task :check_status do
+    on release_roles fetch(:nginx_roles) do
+      output = capture(:sudo, "systemctl status nginx.service")
+      puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+      output.each_line do |line|
+          puts line
+      end
+      puts "#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#"
+    end
+  end
+  
+  
+  #
+  # Fix restart problems with nginx
+  # https://easyengine.io/tutorials/nginx/troubleshooting/emerg-bind-failed-98-address-already-in-use/
+  #
+  desc "fix port Problem: 0.0.0.0:80 failed (98: Address already in use)"
+  task :fix_port80 do
+    on release_roles fetch(:nginx_roles) do
+      execute :sudo, 'fuser -k 80/tcp'
+    end
+  end
+  desc "fix ssl port Problem: 0.0.0.0:443 failed (98: Address already in use)"
+  task :fix_port443 do
+    on release_roles fetch(:nginx_roles) do
+      execute :sudo, 'fuser -k 443/tcp'
+    end
+  end
 
   after 'deploy:check', nil do
     on release_roles fetch(:nginx_roles) do

data/lib/capistrano/tasks/pwa.rake

@@ -0,0 +1,129 @@
+require 'capistrano/magic_recipes/base_helpers'
+include Capistrano::MagicRecipes::BaseHelpers
+
+namespace :load do
+  task :defaults do
+    set :pwa_roles,           -> { :web }
+    set :pwa_application,     -> { "#{fetch(:application)}_mobile" }
+    
+    set :pwa_root_path,       -> { "#{ current_path }/dist" }
+    set :pwa_local_path,      -> { "./dist/" }
+    
+    set :pwa_domains,         -> { [] }
+    set :pwa_major_domain,    -> { false }
+    set :pwa_ssl_domains,     -> { fetch(:pwa_major_domain,false) ? [fetch(:pwa_major_domain)] + Array(fetch(:pwa_domains)) : Array(fetch(:pwa_domains)) }
+    set :pwa_is_default_site, -> { false }
+    set :pwa_nginx_hooks,     -> { false }
+    
+    set :pwa_use_ssl,         -> { false }
+    set :pwa_ssl_cert,        -> { "" }
+    set :pwa_ssl_key,         -> { "" }
+  end
+end
+
+namespace :lets_encrypt do
+  
+  desc "Generate PWA LetsEncrypt certificate"
+  task :pwa_certonly do
+    on release_roles fetch(:lets_encrypt_roles) do
+      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{ fetch(:pwa_root_path) } -d #{ fetch(:pwa_ssl_domains) }"
+    end
+  end
+  
+  desc "Generate PWA LetsEncrypt certificate + expand"
+  task :pwa_certonly_expand do
+    on release_roles fetch(:lets_encrypt_roles) do
+      execute :sudo, "#{ fetch(:lets_encrypt_path) }/certbot-auto --non-interactive --agree-tos --email #{fetch(:lets_encrypt_email)} certonly --webroot -w #{ fetch(:pwa_root_path) } #{ Array(fetch(:pwa_ssl_domains)).map{ |d| "-d #{d.gsub(/^\*?\./, '')}"}.join(" ") } --expand"
+    end
+  end
+  
+end
+
+
+namespace :pwa do
+  
+  desc "upload dist folder (BETA)"
+  task :upload do
+    on roles fetch(:pwa_roles) do
+      local_dir = "./dist/"
+      remote_dir = "#{host.user}@#{host.hostname}:#{ fetch(:pwa_root_path) }"
+      
+      run_locally { execute "rsync -avr --delete #{fetch(:pwa_local_path)} #{fetch(:pwa_root_path)}" }
+    end
+  end
+  
+  
+end
+
+
+namespace :nginx do
+  
+  task :load_pwa_vars do
+    set :nginx_pwa_application,     -> { "pwa_#{fetch(:pwa_application)}_#{fetch(:stage)}" }
+    set :enabled_pwa_application,   -> { File.join(fetch(:sites_enabled), "#{fetch(:pwa_application)}_#{fetch(:stage)}") }
+    set :available_pwa_application, -> { File.join(fetch(:sites_available), "#{fetch(:pwa_application)}_#{fetch(:stage)}") }
+  end
+  
+  namespace :pwa_site do
+    
+    desc 'Creates PWA site configuration and upload it to the available folder'
+    task :add => ['nginx:load_pwa_vars'] do
+      on release_roles fetch(:nginx_roles) do
+        within fetch(:sites_available) do
+          config_file = fetch(:pwa_nginx_template)
+          if config_file == :default
+            magic_template("nginx_pwa.conf", '/tmp/nginx_pwa.conf')
+          else
+            magic_template(config_file, '/tmp/nginx_pwa.conf')
+          end
+          execute :sudo, :mv, '/tmp/nginx_pwa.conf', fetch(:nginx_pwa_application)
+        end
+      end
+    end
+    
+    desc 'Enables PWA site creating a symbolic link into the enabled folder'
+    task :enable => ['nginx:load_pwa_vars'] do
+      on release_roles fetch(:nginx_roles) do
+        if test "! [ -h #{fetch(:enabled_pwa_application)} ]"
+          within fetch(:sites_enabled) do
+            execute :sudo, :ln, '-nfs', fetch(:available_pwa_application), fetch(:enabled_pwa_application)
+          end
+        end
+      end
+    end
+
+    desc 'Disables PWA site removing the symbolic link located in the enabled folder'
+    task :disable => ['nginx:load_pwa_vars'] do
+      on release_roles fetch(:nginx_roles) do
+        if test "[ -f #{fetch(:enabled_pwa_application)} ]"
+          within fetch(:sites_enabled) do
+            execute :sudo, :rm, '-f', fetch(:nginx_pwa_application)
+          end
+        end
+      end
+    end
+
+    desc 'Removes PWA site removing the configuration file from the available folder'
+    task :remove => ['nginx:load_pwa_vars'] do
+      on release_roles fetch(:nginx_roles) do
+        if test "[ -f #{fetch(:enabled_pwa_application)} ]"
+          within fetch(:sites_available) do
+            execute :sudo, :rm, fetch(:nginx_pwa_application)
+          end
+        end
+      end
+    end
+    
+  end
+end
+
+
+namespace :deploy do
+  before 'deploy:restart_nginx_app', :config_pwa_nginx_app do
+    if fetch(:pwa_nginx_hooks)
+      invoke "nginx:pwa_site:add"
+      invoke "nginx:pwa_site:enable"
+    end
+  end
+end
+

data/lib/generators/capistrano/magic_recipes/templates/nginx_pwa.conf.erb

@@ -0,0 +1,84 @@
+# Mobile - App
+<% if fetch(:pwa_use_ssl) %>
+<% if fetch(:pwa_major_domain, false) %>
+server {
+  listen                80<%= ' default_server' if fetch(:pwa_is_default_site) %>;
+  server_name           <%= Array(fetch(:pwa_domains)).join(joiner) %>;
+  return 301 https://<%= fetch(:pwa_major_domain)  %>$request_uri;
+  
+}
+<% else %>
+server {
+  listen                80;
+  server_name           <%= Array(fetch(:pwa_domains)).join(joiner) %>;
+  return 301 https://$host$request_uri;
+}
+<% end %>
+<% end %>
+
+<% if fetch(:pwa_major_domain, false) %>
+<% if fetch(:pwa_use_ssl) %>
+# ssl-domain
+server {
+  listen                443;
+  server_name           <%= Array(fetch(:pwa_domains)).join(joiner) %>;
+  
+  ssl                   on;
+  ssl_certificate       <%= fetch(:pwa_ssl_cert) %>;
+  ssl_certificate_key   <%= fetch(:pwa_ssl_key) %>;
+  
+  return 301 https://<%= fetch(:pwa_major_domain) %>$request_uri;
+}
+<% else %>
+server {
+  listen                80;
+  server_name           <%= Array(fetch(:pwa_domains)).join(joiner) %>;
+  return 301 http://<%= fetch(:pwa_major_domain) %>$request_uri;
+}
+<% end %>
+<% end %>
+
+
+
+server {
+<% if fetch(:nginx_use_ssl) %>
+  listen                443 ssl http2<%= ' default_server' if fetch(:pwa_is_default_site) %>;
+  #listen                [::]:443 ssl http2<%= ' default_server' if fetch(:pwa_is_default_site) %>;
+  ssl                   on;
+  ssl_certificate       <%= fetch(:pwa_ssl_cert) %>;
+  ssl_certificate_key   <%= fetch(:pwa_ssl_key) %>;
+  <%= magic_render("nginx/diffie_hellman") %>
+<% else %>
+  listen                80<%= ' default deferred' if fetch(:pwa_is_default_site) %>;
+  listen                [::]:80<%= ' default deferred' if fetch(:pwa_is_default_site) %>;
+<% end %>
+  
+<% if fetch(:nginx_major_domain) %>
+  server_name           <%= fetch(:pwa_major_domain) %>;
+<% else %>
+  server_name           <%= Array(fetch(:pwa_domains)).join(joiner) %>;
+<% end %>
+  
+  client_max_body_size  4G;
+  keepalive_timeout     10;
+  
+  root                  <%= fetch(:pwa_root_path) %>;
+  
+  
+  location ~ /.well-known { allow all; }
+  
+  # location ^~ /css|img|js/ {
+  #   gzip_static         on;
+  #   expires             max;
+  #   add_header          Cache-Control     public;
+  # }
+  
+  # index
+  # index index.html;
+  
+  # SPA-routing
+  location / {
+  	try_files $uri $uri/ /index.html;
+  }
+  
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.80
+  version: 0.0.81
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,7 @@ files:
 - lib/capistrano/magic_recipes/logs.rb
 - lib/capistrano/magic_recipes/monit.rb
 - lib/capistrano/magic_recipes/nginx.rb
+- lib/capistrano/magic_recipes/pwa.rb
 - lib/capistrano/magic_recipes/redis.rb
 - lib/capistrano/magic_recipes/secrets.rb
 - lib/capistrano/magic_recipes/sidekiq.rb
@@ -169,6 +170,7 @@ files:
 - lib/capistrano/tasks/monit.rake
 - lib/capistrano/tasks/monit_sidekiq.rake
 - lib/capistrano/tasks/nginx.rake
+- lib/capistrano/tasks/pwa.rake
 - lib/capistrano/tasks/redis.rake
 - lib/capistrano/tasks/secrets.rake
 - lib/capistrano/tasks/sidekiq.rake
@@ -189,6 +191,7 @@ files:
 - lib/generators/capistrano/magic_recipes/templates/nginx/rails_cache_path.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/rails_cache_server.erb
 - lib/generators/capistrano/magic_recipes/templates/nginx/remove_www.erb
+- lib/generators/capistrano/magic_recipes/templates/nginx_pwa.conf.erb
 - lib/generators/capistrano/magic_recipes/templates/postgresql.yml.erb
 - lib/generators/capistrano/magic_recipes/templates/secrets_yml.erb
 - lib/generators/capistrano/magic_recipes/templates/thin_app_yml.erb