rails_deploy 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b60e97f2fa4d6bd1b562e87bfcccd11f36c3cf16cb90eee419043e8791549891
-  data.tar.gz: 25832aedf15fba6091d864ab11f47f46b9e22a64644eae4418bed8f9a4626d2e
+  metadata.gz: 9ccb48e7834524a85cac78d6786dfbdb4ea9b606e798a72e246cc9389c015500
+  data.tar.gz: 11dac7ec11c08244704857df24a181729d6431dfd5edbfe217615a6dffe4195f
 SHA512:
-  metadata.gz: e6ca32c3bf6b6b4166d0ff5d0c3fda9be10b7d71368f76e04187ee9513e8ac5accae6095c919cc17501db19aac82e92ea39d96218c24751496f7892893384c36
-  data.tar.gz: 638266a585b8d588b4cfe8414b8c4e60706579c7a602eacbb3f0524dae181828016e547f3a14cb02238c2cbc44e40af3aa4bb5c775026d01c939339cbd1233d7
+  metadata.gz: b5cbfebbe5c1b03e77e7bf11cd412f74ea9fba9cdc7b6a4cb3ee73f715c923566d67456ff200b1aaf10e1d180a9a7309d952d326374531e76b19cd788387b32c
+  data.tar.gz: 1ffc8141ccab19be37680528959f2609ac96cda97a4746f5c26fd32fc074e05096412834c50bcdb2ca5efbc144cd20b70634097e42cd59e3b12f20857436c900

data/lib/kamal_override/{clone.rb → commands/clone.rb}

@@ -1,4 +1,4 @@
-module KamalOverride
+module KamalOverride::Commands
   module Clone
 
     def clone
@@ -11,4 +11,4 @@ module KamalOverride
   end
 end
 
-Kamal::Commands::Builder::Clone.prepend KamalOverride::Clone
+Kamal::Commands::Builder::Clone.prepend KamalOverride::Commands::Clone

data/lib/kamal_override/{docker.rb → commands/docker.rb}

@@ -1,4 +1,4 @@
-module KamalOverride
+module KamalOverride::Commands
   module Docker
 
     private
@@ -13,4 +13,4 @@ module KamalOverride
   end
 end
 
-Kamal::Commands::Docker.prepend KamalOverride::Docker
+Kamal::Commands::Docker.prepend KamalOverride::Commands::Docker

data/lib/kamal_override/{proxy.rb → commands/proxy.rb}

@@ -1,4 +1,4 @@
-module KamalOverride
+module KamalOverride::Commands
   module Proxy
 
     def run
@@ -18,4 +18,4 @@ module KamalOverride
   end
 end
 
-Kamal::Commands::Proxy.prepend KamalOverride::Proxy
+Kamal::Commands::Proxy.prepend KamalOverride::Commands::Proxy

data/lib/kamal_override/configuration/proxy.rb

@@ -0,0 +1,18 @@
+module KamalOverride::Configuration
+  module Proxy
+
+    def deploy_options
+      super.merge!(
+        'tls-certificate-path': proxy_config['ssl_certificate_path'].presence,
+        'tls-private-key-path': proxy_config['ssl_private_key_path'].presence
+      ).compact
+    end
+
+    def custom_ssl_certificate?
+      proxy_config['ssl_certificate_path'].present?
+    end
+
+  end
+end
+
+Kamal::Configuration::Proxy.prepend KamalOverride::Configuration::Proxy

data/lib/kamal_override/configuration/role.rb

@@ -0,0 +1,13 @@
+module KamalOverride::Configuration
+  module Role
+
+    def ensure_one_host_for_ssl
+      if running_proxy? && proxy.ssl? && hosts.size > 1 && !proxy.custom_ssl_certificate?
+        raise Kamal::ConfigurationError, "SSL is only supported on a single server unless you provide custom certificates?, found #{hosts.size} servers for role #{name}"
+      end
+    end
+
+  end
+end
+
+Kamal::Configuration::Role.prepend KamalOverride::Configuration::Role

data/lib/kamal_override/configuration.rb

@@ -2,7 +2,7 @@ module KamalOverride
   module Configuration
 
     def proxy_image
-      'ccr.ccs.tencentyun.com/kamal/kamal-proxy:v0.8.2'
+      "ccr.ccs.tencentyun.com/kamal/kamal-proxy:#{PROXY_MINIMUM_VERSION}"
     end
 
   end

data/lib/kamal_override.rb

@@ -1,5 +1,9 @@
+require 'kamal_override/commands/clone'
+require 'kamal_override/commands/docker'
+require 'kamal_override/commands/proxy'
+
+require 'kamal_override/configuration/proxy'
+require 'kamal_override/configuration/role'
+
 require 'kamal_override/build_clone'
-require 'kamal_override/clone'
-require 'kamal_override/configuration'
-require 'kamal_override/docker'
-require 'kamal_override/proxy'
+require 'kamal_override/configuration'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Mingyuan Qin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-13 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,10 +50,12 @@ files:
 - lib/deploy.rb
 - lib/kamal_override.rb
 - lib/kamal_override/build_clone.rb
-- lib/kamal_override/clone.rb
+- lib/kamal_override/commands/clone.rb
+- lib/kamal_override/commands/docker.rb
+- lib/kamal_override/commands/proxy.rb
 - lib/kamal_override/configuration.rb
-- lib/kamal_override/docker.rb
-- lib/kamal_override/proxy.rb
+- lib/kamal_override/configuration/proxy.rb
+- lib/kamal_override/configuration/role.rb
 homepage: https://github.com/work-design/rails_deploy
 licenses:
 - MIT
@@ -73,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.20
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Deploy from server