From a600faa0fc57bb920d007d8772f1399584730e20 Mon Sep 17 00:00:00 2001 From: Mike Dalessio Date: Fri, 21 Nov 2025 11:21:19 -0500 Subject: [PATCH] Update beta deployment and secrets config to use the production database. Note: - no jobs containers are running - we use a single cache db (not a DC-local one) --- .kamal/secrets.beta | 8 +++++++- config/deploy.beta.yml | 30 +++++++++++++++++++++++------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.kamal/secrets.beta b/.kamal/secrets.beta index 9d9a33d9f..87583b01f 100644 --- a/.kamal/secrets.beta +++ b/.kamal/secrets.beta @@ -1,6 +1,12 @@ -SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Beta/RAILS_MASTER_KEY) +SECRETS=$(kamal secrets fetch --adapter 1password --account basecamp --from Deploy/Fizzy Deployments/BASECAMP_REGISTRY_PASSWORD Deployments/DASH_BASIC_AUTH_SECRET Beta/RAILS_MASTER_KEY Beta/MYSQL_ALTER_PASSWORD Beta/MYSQL_ALTER_USER Beta/MYSQL_APP_PASSWORD Beta/MYSQL_APP_USER Beta/MYSQL_READONLY_PASSWORD Beta/MYSQL_READONLY_USER) GITHUB_TOKEN=$(gh config get -h github.com oauth_token) BASECAMP_REGISTRY_PASSWORD=$(kamal secrets extract BASECAMP_REGISTRY_PASSWORD $SECRETS) DASH_BASIC_AUTH_SECRET=$(kamal secrets extract DASH_BASIC_AUTH_SECRET $SECRETS) RAILS_MASTER_KEY=$(kamal secrets extract RAILS_MASTER_KEY $SECRETS) +MYSQL_ALTER_PASSWORD=$(kamal secrets extract MYSQL_ALTER_PASSWORD $SECRETS) +MYSQL_ALTER_USER=$(kamal secrets extract MYSQL_ALTER_USER $SECRETS) +MYSQL_APP_PASSWORD=$(kamal secrets extract MYSQL_APP_PASSWORD $SECRETS) +MYSQL_APP_USER=$(kamal secrets extract MYSQL_APP_USER $SECRETS) +MYSQL_READONLY_PASSWORD=$(kamal secrets extract MYSQL_READONLY_PASSWORD $SECRETS) +MYSQL_READONLY_USER=$(kamal secrets extract MYSQL_READONLY_USER $SECRETS) diff --git a/config/deploy.beta.yml b/config/deploy.beta.yml index f1db401c7..efce5f28b 100644 --- a/config/deploy.beta.yml +++ b/config/deploy.beta.yml @@ -1,16 +1,14 @@ servers: web: hosts: - - fizzy-beta-app-01.sc-chi-int.37signals.com - - fizzy-beta-app-101.df-iad-int.37signals.com - labels: - otel_scrape_enabled: true - jobs: - hosts: - - fizzy-beta-app-01.sc-chi-int.37signals.com + - fizzy-beta-app-01.sc-chi-int.37signals.com: sc_chi + - fizzy-beta-app-101.df-iad-int.37signals.com: df_iad labels: otel_scrape_enabled: true +# we don't run the jobs role in beta +allow_empty_roles: true + proxy: ssl: false @@ -20,6 +18,24 @@ ssh: env: clear: RAILS_ENV: beta + MYSQL_DATABASE_HOST: fizzy-mysql-primary + MYSQL_DATABASE_REPLICA_HOST: fizzy-mysql-replica + MYSQL_SOLID_CABLE_HOST: fizzy-mysql-primary + MYSQL_SOLID_QUEUE_HOST: fizzy-mysql-primary + MYSQL_SOLID_CACHE_HOST: fizzy-beta-solidcache-db-101 + secret: + - RAILS_MASTER_KEY + - MYSQL_ALTER_PASSWORD + - MYSQL_ALTER_USER + - MYSQL_APP_PASSWORD + - MYSQL_APP_USER + - MYSQL_READONLY_PASSWORD + - MYSQL_READONLY_USER + tags: + sc_chi: {} + df_iad: + PRIMARY_DATACENTER: true + df_ams: {} accessories: load-balancer: