dry-stack 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc36a4ac71daadd170966e113e368abcfbf9b48ffb6426e95930998d2be5dceb
-  data.tar.gz: d6eb7c94d22cfc9856220de70323dfebadab317f9406b949460e228f801f0e46
+  metadata.gz: e89cc36be6a8e0f6db5be4eca8e8d297d9d3c3367b1b4405ceead26a132135ff
+  data.tar.gz: 9abda29bf7bd47cb965e8451fe28f1098ec6a693a6bb2abab27640f5a45b2cf7
 SHA512:
-  metadata.gz: 9cc038e43d49094fdf0b8b622992b35de088dd9412808eb5ad188ce7998fcb7869f42924a607516907bf67fa8fa9c2ec6ecedda016785ace90470bab9636bffd
-  data.tar.gz: dfd3c29783f27f0877a5ccefb6d72e01217610a1fa9e4d557dac2cced99a07fb21974d6253e273cd33f9c47d0a344eb8357b67a8f64c98eb78e532d28bee9357
+  metadata.gz: 9cd2a2fe089e113edc081cbbc61d62bb083bf2c6b6d6e27744b33185022d4c4908c0ac8984b7d0e46153a9e69e0bb4a567a50d3a9d1fc7ecd28129443afb153c
+  data.tar.gz: 0d1fa007595809ae419716597527ca9558efc8e11322454c11d9b2b220c6829c89366d707032f6bd333c854f54337d0052a58ee0ef48132a07ff7abfe4342736

data/lib/dry-stack/stack.rb

@@ -184,48 +184,69 @@ module Dry
 
           ingress.each_with_index do |ing, index|
             ing[:port] ||= service[:ports]&.first
-            service[:deploy][:labels] += [
-              "traefik.http.routers.#{service_name}-#{index}.service=#{service_name}-#{index}",
-              "traefik.http.services.#{service_name}-#{index}.loadbalancer.server.port=#{ing[:port]}"
-            ]
-
-            if opts[:traefik_tls]
+            if ing[:host_sni]
               domain = opts[:tls_domain] || 'example.com'
-              domain = ing[:host].gsub('.*', ".#{domain}") if ing[:host]
+              domain = ing[:host_sni].gsub('.*', ".#{domain}")
               domain = ing[:tls_domain] if ing[:tls_domain]
-              service[:deploy][:labels] += [
-                "traefik.http.routers.#{service_name}-#{index}.tls=true",
-                "traefik.http.routers.#{service_name}-#{index}.tls.certresolver=le",
-                "traefik.http.routers.#{service_name}-#{index}.tls.domains[0].main=#{domain}"
-              ]
-            end
 
-            rule = []
-            rule << "HostRegexp(`{name:#{nginx_host2regexp ing[:host]}}`)" if ing[:host]
-            rule << "ClientIP(#{[ing[:client_ip]].flatten.map{ "`#{_1}`" }.join ','})" if ing[:client_ip]
-            rule << "PathPrefix(`#{nginx_host2regexp ing[:path]}`)" if ing[:path]
-            rule << "#{ing[:rule]}" if ing[:rule]
+              ing[:passthrough] = true unless ing.key? :passthrough
 
-            middlewares = []
+              service[:deploy][:labels] += [
+                "traefik.tcp.routers.#{service_name}-#{index}.tls=true",
+                "traefik.tcp.routers.#{service_name}-#{index}.tls.certresolver=le",
+                "traefik.tcp.routers.#{service_name}-#{index}.tls.domains[0].main=#{domain}",
 
-            if ing[:basic_auth]
-              ba_user, ba_password, salt = ing[:basic_auth].split ':'
-              hashed_password = apr1_crypt ba_password, (salt || rand(36**8).to_s(36))
-              service[:deploy][:labels] << "traefik.http.middlewares.#{service_name}-#{index}_auth.basicauth.users=#{ba_user}:#{hashed_password.gsub('$','$$')}"
-              middlewares << "#{service_name}-#{index}_auth"
-            end
+                "traefik.tcp.routers.#{service_name}-#{index}.service=#{service_name}-#{index}",
+                "traefik.tcp.services.#{service_name}-#{index}.loadbalancer.server.port=#{ing[:port]}",
 
-            service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.rule=#{rule.join ' && '}"
+                "traefik.tcp.routers.#{service_name}-#{index}.rule=HostSNI(`#{domain}`)",
+                "traefik.tcp.routers.#{service_name}-#{index}.tls.passthrough=#{ing[:passthrough]}"
+              ]
 
-            if ing[:path_sub]
-              middlewares << "#{service_name}-#{index}-path_sub"
+            else
               service[:deploy][:labels] += [
-                "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.regex=#{ing[:path_sub][0]}",
-                "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.replacement=#{ing[:path_sub][1].gsub('$','$$')}"
+                "traefik.http.routers.#{service_name}-#{index}.service=#{service_name}-#{index}",
+                "traefik.http.services.#{service_name}-#{index}.loadbalancer.server.port=#{ing[:port]}"
               ]
-            end
 
-            service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.middlewares=#{middlewares.join ","}" unless middlewares.empty?
+              if opts[:traefik_tls]
+                domain = opts[:tls_domain] || 'example.com'
+                domain = ing[:host].gsub('.*', ".#{domain}") if ing[:host]
+                domain = ing[:tls_domain] if ing[:tls_domain]
+                service[:deploy][:labels] += [
+                  "traefik.http.routers.#{service_name}-#{index}.tls=true",
+                  "traefik.http.routers.#{service_name}-#{index}.tls.certresolver=le",
+                  "traefik.http.routers.#{service_name}-#{index}.tls.domains[0].main=#{domain}"
+                ]
+              end
+
+              rule = []
+              rule << "HostRegexp(`{name:#{nginx_host2regexp ing[:host]}}`)" if ing[:host]
+              rule << "ClientIP(#{[ing[:client_ip]].flatten.map{ "`#{_1}`" }.join ','})" if ing[:client_ip]
+              rule << "PathPrefix(`#{ing[:path]}`)" if ing[:path]
+              rule << "#{ing[:rule]}" if ing[:rule]
+
+              middlewares = []
+
+              if ing[:basic_auth]
+                ba_user, ba_password, salt = ing[:basic_auth].split ':'
+                hashed_password = apr1_crypt ba_password, (salt || rand(36**8).to_s(36))
+                service[:deploy][:labels] << "traefik.http.middlewares.#{service_name}-#{index}_auth.basicauth.users=#{ba_user}:#{hashed_password.gsub('$','$$')}"
+                middlewares << "#{service_name}-#{index}_auth"
+              end
+
+              service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.rule=#{rule.join ' && '}"
+
+              if ing[:path_sub]
+                middlewares << "#{service_name}-#{index}-path_sub"
+                service[:deploy][:labels] += [
+                  "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.regex=#{ing[:path_sub][0]}",
+                  "traefik.http.middlewares.#{service_name}-#{index}-path_sub.replacepathregex.replacement=#{ing[:path_sub][1].gsub('$','$$')}"
+                ]
+              end
+
+              service[:deploy][:labels] << "traefik.http.routers.#{service_name}-#{index}.middlewares=#{middlewares.join ","}" unless middlewares.empty?
+            end
           end
         end
         service.delete :ingress

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.22'
+    VERSION = '0.1.24'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - Artyom B
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-29 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,7 +114,7 @@ licenses:
 - Nonstandard
 metadata:
   source_code_uri: https://github.com/artyomb/dry-stack
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Dry docker swarm stack definition
 test_files: []