From 190e52ffc5c88782f3ed2c03db6a6782c7a16d70 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Wed, 25 Jun 2025 15:04:02 -0400 Subject: [PATCH 1/3] Update kamal deploy config for the new beta env. --- config/deploy.beta.yml | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml index d75d07a28..cc0d271c2 100644 --- a/config/deploy.beta.yml +++ b/config/deploy.beta.yml @@ -1,14 +1,20 @@ servers: web: hosts: - - fizzy.37signals.works + - fizzy-beta-app-01 jobs: hosts: - - fizzy.37signals.works + - fizzy-beta-app-01 + web-replica: + hosts: + - fizzy-beta-app-101 + proxy: true proxy: - hosts: - - fizzy.37signals.works # the single tenant is named "fizzy" + ssl: false + +ssh: + user: app env: clear: @@ -16,7 +22,7 @@ env: LOCAL_AUTHENTICATION: t x-beamer-accessory: &beamer-accessory - image: basecamp/beamer + image: basecamp/beamer:vfs registry: username: bcbot password: @@ -26,11 +32,30 @@ x-beamer-accessory: &beamer-accessory volumes: - fizzy:/storage + accessories: beamer-primary: <<: *beamer-accessory service: beamer-primary - cmd: beamer primary --remove-after=1h --dir=/storage + cmd: beamer primary --remove-after=1h --dir=/storage --disable-tls port: 5000:80 roles: - web + + beamer-replica: + <<: *beamer-accessory + service: beamer-replica + cmd: beamer replica --primary=http://fizzy-beta-app-01:5000/ --dir=/storage + roles: + - web-replica + + load-balancer: + image: basecamp/kamal-proxy:lb + roles: + - web + options: + publish: + - 80:80 + - 443:443 + volumes: + - load-balancer:/home/kamal-proxy/.config/kamal-proxy From 0c5c6fa703e2f2c8457c464d9caf7df3fcdd5372 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 26 Jun 2025 08:41:33 -0400 Subject: [PATCH 2/3] Turn off local auth in beta, we'll use Launchpad instead. --- config/deploy.beta.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml index cc0d271c2..0201ec55b 100644 --- a/config/deploy.beta.yml +++ b/config/deploy.beta.yml @@ -19,7 +19,6 @@ ssh: env: clear: RAILS_ENV: beta - LOCAL_AUTHENTICATION: t x-beamer-accessory: &beamer-accessory image: basecamp/beamer:vfs From 27c288406b11ce0e2847c8492c05051610b6162c Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Thu, 26 Jun 2025 09:45:11 -0400 Subject: [PATCH 3/3] Update to Kevin's preferred signal identity. --- script/signal-id-email-update.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/script/signal-id-email-update.rb b/script/signal-id-email-update.rb index 1a4626f47..23e06f69f 100755 --- a/script/signal-id-email-update.rb +++ b/script/signal-id-email-update.rb @@ -3,6 +3,7 @@ require_relative "../config/environment" CHANGES = [ + { from: "kevin@37signals.com", to: "kevin@basecamp.com" }, { from: "david@37signals.com", to: "david@hey.com" }, { from: "jay@37signals.com", to: "jay@basecamp.com" }, { from: "jeremy@37signals.com", to: "jeremy@basecamp.com" },