Merge branch 'main' into custom-views

* main:
  Update to Kevin's preferred signal identity.
  Turn off local auth in beta, we'll use Launchpad instead.
  Update kamal deploy config for the new beta env.
This commit is contained in:
Jason Zimdars
2025-06-26 09:33:11 -05:00
2 changed files with 32 additions and 7 deletions
+31 -7
View File
@@ -1,22 +1,27 @@
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:
RAILS_ENV: beta
LOCAL_AUTHENTICATION: t
x-beamer-accessory: &beamer-accessory
image: basecamp/beamer
image: basecamp/beamer:vfs
registry:
username: bcbot
password:
@@ -26,11 +31,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
+1
View File
@@ -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" },