capistrano-twingly 4.0.4 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f8f583d6a2f3186696bf34770d1e625320200e2d214dbf60ab0e9d4e25808a
-  data.tar.gz: a7a9ca0a5d69e5820e5c2f5cbe19f62711261c4276ab270d34d3114b32c43061
+  metadata.gz: 6e9fcc36ffdef58414469cc49e1cfc11f645c8dd92f0abe2599e7cd61d508e40
+  data.tar.gz: eda3cd5412c4c2ba5af7100fad39a47009a0944e40ca9cf8dd393627c5e730b1
 SHA512:
-  metadata.gz: c4f6236ebfe68552a06884bb41637521810e72ff02a9fb2fbc41b6bd4cfdfd3ee4ca9df920434728fdb3866f735419272121f3e102e49fed307d5c45f618feca
-  data.tar.gz: 96f1ed608d1a6ff88b6f1c2aa617da057412f8e7125cb2a4b75a7218f3c51608f0343544b36da2bcce3b92d910d8f05d90faef2ef6d33c09dc0452c24f947c95
+  metadata.gz: b8f9e0d29574b26cbe6b746e4d107cdfe1498182b20a06016a587a9a16eb6d61dcfc33b8579d073e454ff6b29211e2f0de5707988c815877f0add58df98c1c4f
+  data.tar.gz: bd6bbc8590824d69b1510049c479424acff5731a0bce73f30c4c91e56d076c5b81c00aaad0e3bf6219b70780a40a2251c075b20a730fbc381c79b40fb10b62cb

data/.github/workflows/ci.yml

@@ -6,15 +6,15 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        ruby: [2.7.3, 3.0.1, head]
+        ruby: [2.7.6, 3.0.4, 3.1.2]
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [v4.1.0](https://github.com/twingly/capistrano-twingly/tree/v4.1.0) (2023-01-10)
+
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v4.0.4...v4.1.0)
+
+**Fixed bugs:**
+
+- Deploy broken in macOS 13 because of DNS issues [\#68](https://github.com/twingly/capistrano-twingly/issues/68)
+
+**Merged pull requests:**
+
+- Use datacenter gateway as fallback DNS server [\#69](https://github.com/twingly/capistrano-twingly/pull/69) ([roback](https://github.com/roback))
+- Keep GitHub Actions file up-to-date [\#67](https://github.com/twingly/capistrano-twingly/pull/67) ([roback](https://github.com/roback))
+
+## [v4.0.4](https://github.com/twingly/capistrano-twingly/tree/v4.0.4) (2022-06-28)
+
+[Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v4.0.3...v4.0.4)
+
+**Merged pull requests:**
+
+- Use net-ssh ~\> 7.0 [\#66](https://github.com/twingly/capistrano-twingly/pull/66) ([Pontus4](https://github.com/Pontus4))
+- Run CI on latest Rubies [\#64](https://github.com/twingly/capistrano-twingly/pull/64) ([walro](https://github.com/walro))
+- Ruby 3.0.0 on CI [\#62](https://github.com/twingly/capistrano-twingly/pull/62) ([walro](https://github.com/walro))
+
 ## [v4.0.3](https://github.com/twingly/capistrano-twingly/tree/v4.0.3) (2021-01-14)
 
 [Full Changelog](https://github.com/twingly/capistrano-twingly/compare/v4.0.2...v4.0.3)

data/README.md

@@ -47,6 +47,7 @@ require 'capistrano/twingly/nginx'
 set :app_name, 'contest-bamba'
 set :server_names, %w(bamba.bloggportalen.se)
 set :use_https, true # Optional
+set :forwarded_protocol_is_https, true # Optional
 
 namespace :deploy do
   after :finishing, 'deploy:nginx:generate_config'

data/capistrano-twingly.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano-twingly"
-  spec.version       = '4.0.4'
+  spec.version       = '4.2.0'
   spec.authors       = ["Twingly AB"]
   spec.email         = ["support@twingly.com"]
   spec.summary       = %q{Capistrano 3 tasks used for Twingly's Ruby deployment}

data/lib/capistrano/twingly/tasks/nginx.rake

@@ -9,6 +9,7 @@ namespace :deploy do
       server_names = fetch(:server_names)
 
       https_port = ":443" if fetch(:use_https)
+      forwarded_protocol_is_https = fetch(:forwarded_protocol_is_https)
 
       conf = File.open('tmp/site.conf', 'w')
       conf << %Q{
@@ -42,6 +43,7 @@ namespace :deploy do
             proxy_set_header   Host             $host#{https_port};
             proxy_set_header   X-Real-IP        $remote_addr;
             proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
+            #{forwarded_protocol_is_https ? "proxy_set_header   X-Forwarded-Proto https;" : ""}
           }
         }\n}
         conf.close

data/lib/capistrano/twingly/tasks/servers_from_srv_record.rake

@@ -3,14 +3,25 @@ require 'resolv'
 SRV_RECORDS = %w[
   _rubyapps._tcp.sth.twingly.network
 ]
+FALLBACK_DNS_SERVER = "gateway.sth.twingly.network"
 
-resolver = Resolv::DNS.new
+def lookup_srv_records(resolver: Resolv::DNS.new)
+  SRV_RECORDS.map do |srv_record|
+    resolver.getresources(srv_record, Resolv::DNS::Resource::IN::SRV)
+  end.flatten.map(&:target).map(&:to_s)
+end
+
+servers = lookup_srv_records
 
-servers = SRV_RECORDS.map do |srv_record|
-  resolver.getresources(srv_record, Resolv::DNS::Resource::IN::SRV)
-end.flatten.map(&:target).map(&:to_s)
+# Query datacenter gateway directly if local DNS server is unable to find the SRV records
+if servers.empty?
+  datacenter_dns_server_address = Resolv.getaddress(FALLBACK_DNS_SERVER)
 
-raise "Can't find any servers, no records for #{SRV_RECORDS}" if servers.empty?
+  resolver = Resolv::DNS.new(nameserver: datacenter_dns_server_address)
+  servers  = lookup_srv_records(resolver: resolver)
+
+  raise "Can't find any servers, no records for #{SRV_RECORDS}" if servers.empty?
+end
 
 set :servers_from_srv_record, servers
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-twingly
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.2.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -195,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.4
 signing_key:
 specification_version: 4
 summary: Capistrano 3 tasks used for Twingly's Ruby deployment