@caelo-cms/provisioning 0.11.9 → 0.11.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapter.d.ts +6 -0
- package/dist/adapter.d.ts.map +1 -1
- package/dist/admin-domain.d.ts +10 -1
- package/dist/admin-domain.d.ts.map +1 -1
- package/dist/admin-domain.js +13 -3
- package/dist/admin-domain.js.map +1 -1
- package/dist/adopt-existing.d.ts +12 -3
- package/dist/adopt-existing.d.ts.map +1 -1
- package/dist/adopt-existing.js +143 -0
- package/dist/adopt-existing.js.map +1 -1
- package/dist/agent/command.d.ts +23 -0
- package/dist/agent/command.d.ts.map +1 -1
- package/dist/agent/command.js +32 -9
- package/dist/agent/command.js.map +1 -1
- package/dist/agent/run.d.ts +2 -0
- package/dist/agent/run.d.ts.map +1 -1
- package/dist/agent/run.js +5 -1
- package/dist/agent/run.js.map +1 -1
- package/dist/agent-db.js +69 -10
- package/dist/aws-task-roles.d.ts +4 -2
- package/dist/aws-task-roles.d.ts.map +1 -1
- package/dist/aws-task-roles.js +4 -1
- package/dist/aws-task-roles.js.map +1 -1
- package/dist/caddy.d.ts +21 -4
- package/dist/caddy.d.ts.map +1 -1
- package/dist/caddy.js +27 -3
- package/dist/caddy.js.map +1 -1
- package/dist/cli-routing.js +1 -1
- package/dist/cli-routing.js.map +1 -1
- package/dist/cli.js +68 -7
- package/dist/cli.js.map +1 -1
- package/dist/cloudsql-tls.d.ts +93 -0
- package/dist/cloudsql-tls.d.ts.map +1 -0
- package/dist/cloudsql-tls.js +295 -0
- package/dist/cloudsql-tls.js.map +1 -0
- package/dist/compose.d.ts +43 -6
- package/dist/compose.d.ts.map +1 -1
- package/dist/compose.js +148 -23
- package/dist/compose.js.map +1 -1
- package/dist/converge-checkpoint.d.ts +1 -0
- package/dist/converge-checkpoint.d.ts.map +1 -1
- package/dist/converge-checkpoint.js +8 -1
- package/dist/converge-checkpoint.js.map +1 -1
- package/dist/converge-db-trust.d.ts +44 -0
- package/dist/converge-db-trust.d.ts.map +1 -0
- package/dist/converge-db-trust.js +158 -0
- package/dist/converge-db-trust.js.map +1 -0
- package/dist/converge-job-gcp.d.ts +5 -2
- package/dist/converge-job-gcp.d.ts.map +1 -1
- package/dist/converge-job-gcp.js +11 -13
- package/dist/converge-job-gcp.js.map +1 -1
- package/dist/converge-job-preflight.d.ts.map +1 -1
- package/dist/converge-job-preflight.js +8 -0
- package/dist/converge-job-preflight.js.map +1 -1
- package/dist/converge-job.d.ts +17 -0
- package/dist/converge-job.d.ts.map +1 -1
- package/dist/converge-job.js +12 -0
- package/dist/converge-job.js.map +1 -1
- package/dist/deployed-release.d.ts +4 -1
- package/dist/deployed-release.d.ts.map +1 -1
- package/dist/deployed-release.js +18 -8
- package/dist/deployed-release.js.map +1 -1
- package/dist/gcp-names.d.ts +34 -0
- package/dist/gcp-names.d.ts.map +1 -1
- package/dist/gcp-names.js +45 -0
- package/dist/gcp-names.js.map +1 -1
- package/dist/gcp-url-map.d.ts.map +1 -1
- package/dist/gcp-url-map.js +6 -2
- package/dist/gcp-url-map.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/infra-contract.d.ts +1 -1
- package/dist/infra-contract.d.ts.map +1 -1
- package/dist/infra-contract.js +45 -1
- package/dist/infra-contract.js.map +1 -1
- package/dist/install-job.d.ts +4 -2
- package/dist/install-job.d.ts.map +1 -1
- package/dist/install-job.js +4 -1
- package/dist/install-job.js.map +1 -1
- package/dist/install-state.d.ts +13 -0
- package/dist/install-state.d.ts.map +1 -1
- package/dist/install-state.js +17 -4
- package/dist/install-state.js.map +1 -1
- package/dist/lifecycle.d.ts.map +1 -1
- package/dist/lifecycle.js +20 -8
- package/dist/lifecycle.js.map +1 -1
- package/dist/mcp-auth-proxy-setup.d.ts +48 -0
- package/dist/mcp-auth-proxy-setup.d.ts.map +1 -0
- package/dist/mcp-auth-proxy-setup.js +280 -0
- package/dist/mcp-auth-proxy-setup.js.map +1 -0
- package/dist/migration-runner.d.ts.map +1 -1
- package/dist/migration-runner.js +8 -3
- package/dist/migration-runner.js.map +1 -1
- package/dist/migration-targets.d.ts +11 -0
- package/dist/migration-targets.d.ts.map +1 -0
- package/dist/migration-targets.js +12 -0
- package/dist/migration-targets.js.map +1 -0
- package/dist/operator-access.d.ts +10 -0
- package/dist/operator-access.d.ts.map +1 -1
- package/dist/operator-access.js +5 -0
- package/dist/operator-access.js.map +1 -1
- package/dist/pool-budget-stack.d.ts +13 -1
- package/dist/pool-budget-stack.d.ts.map +1 -1
- package/dist/pool-budget-stack.js +11 -1
- package/dist/pool-budget-stack.js.map +1 -1
- package/dist/public-role-isolation.d.ts +7 -3
- package/dist/public-role-isolation.d.ts.map +1 -1
- package/dist/public-role-isolation.js +25 -13
- package/dist/public-role-isolation.js.map +1 -1
- package/dist/release-contract.d.ts.map +1 -1
- package/dist/release-contract.js +3 -0
- package/dist/release-contract.js.map +1 -1
- package/dist/release-manifest.d.ts +25 -1
- package/dist/release-manifest.d.ts.map +1 -1
- package/dist/release-manifest.js +36 -3
- package/dist/release-manifest.js.map +1 -1
- package/dist/remote-mcp.d.ts +55 -18
- package/dist/remote-mcp.d.ts.map +1 -1
- package/dist/remote-mcp.js +307 -77
- package/dist/remote-mcp.js.map +1 -1
- package/dist/runtime-secrets.d.ts +11 -0
- package/dist/runtime-secrets.d.ts.map +1 -1
- package/dist/runtime-secrets.js +40 -25
- package/dist/runtime-secrets.js.map +1 -1
- package/dist/scheduler-setup.d.ts +75 -0
- package/dist/scheduler-setup.d.ts.map +1 -0
- package/dist/scheduler-setup.js +331 -0
- package/dist/scheduler-setup.js.map +1 -0
- package/dist/seal-key-rotation.d.ts +7 -7
- package/dist/seal-key-rotation.d.ts.map +1 -1
- package/dist/seal-key-rotation.js +22 -22
- package/dist/seal-key-rotation.js.map +1 -1
- package/dist/self-hosted-db-tls.d.ts +37 -0
- package/dist/self-hosted-db-tls.d.ts.map +1 -0
- package/dist/self-hosted-db-tls.js +220 -0
- package/dist/self-hosted-db-tls.js.map +1 -0
- package/dist/self-hosted-release.d.ts +3 -1
- package/dist/self-hosted-release.d.ts.map +1 -1
- package/dist/self-hosted-release.js +33 -9
- package/dist/self-hosted-release.js.map +1 -1
- package/dist/self-hosted-roles.d.ts +43 -2
- package/dist/self-hosted-roles.d.ts.map +1 -1
- package/dist/self-hosted-roles.js +87 -1
- package/dist/self-hosted-roles.js.map +1 -1
- package/dist/self-hosted-scheduler-interval.d.ts +21 -0
- package/dist/self-hosted-scheduler-interval.d.ts.map +1 -0
- package/dist/self-hosted-scheduler-interval.js +68 -0
- package/dist/self-hosted-scheduler-interval.js.map +1 -0
- package/dist/self-hosted-start.d.ts +0 -21
- package/dist/self-hosted-start.d.ts.map +1 -1
- package/dist/self-hosted-start.js +39 -1
- package/dist/self-hosted-start.js.map +1 -1
- package/dist/self-hosted-upgrade.d.ts +19 -7
- package/dist/self-hosted-upgrade.d.ts.map +1 -1
- package/dist/self-hosted-upgrade.js +78 -25
- package/dist/self-hosted-upgrade.js.map +1 -1
- package/dist/stack-contract.d.ts +234 -28
- package/dist/stack-contract.d.ts.map +1 -1
- package/dist/stack-contract.js +397 -39
- package/dist/stack-contract.js.map +1 -1
- package/dist/stack-converge.d.ts +31 -0
- package/dist/stack-converge.d.ts.map +1 -1
- package/dist/stack-converge.js +71 -30
- package/dist/stack-converge.js.map +1 -1
- package/dist/staging-database.d.ts +22 -0
- package/dist/staging-database.d.ts.map +1 -0
- package/dist/staging-database.js +117 -0
- package/dist/staging-database.js.map +1 -0
- package/dist/upgrade/app-roll.d.ts +25 -4
- package/dist/upgrade/app-roll.d.ts.map +1 -1
- package/dist/upgrade/app-roll.js +63 -17
- package/dist/upgrade/app-roll.js.map +1 -1
- package/dist/upgrade/converge.d.ts +5 -0
- package/dist/upgrade/converge.d.ts.map +1 -1
- package/dist/upgrade/converge.js +207 -20
- package/dist/upgrade/converge.js.map +1 -1
- package/dist/upgrade/health.d.ts +31 -7
- package/dist/upgrade/health.d.ts.map +1 -1
- package/dist/upgrade/health.js +41 -17
- package/dist/upgrade/health.js.map +1 -1
- package/dist/upgrade/image-forms.d.ts +1 -1
- package/dist/upgrade/image-forms.d.ts.map +1 -1
- package/dist/upgrade/image-forms.js +24 -7
- package/dist/upgrade/image-forms.js.map +1 -1
- package/dist/upgrade/release-images.d.ts +12 -3
- package/dist/upgrade/release-images.d.ts.map +1 -1
- package/dist/upgrade/release-images.js +13 -4
- package/dist/upgrade/release-images.js.map +1 -1
- package/dist/upgrade/upgrade.d.ts +19 -3
- package/dist/upgrade/upgrade.d.ts.map +1 -1
- package/dist/upgrade/upgrade.js +37 -2
- package/dist/upgrade/upgrade.js.map +1 -1
- package/dist/upgrader-gcp.d.ts +13 -0
- package/dist/upgrader-gcp.d.ts.map +1 -1
- package/dist/upgrader-gcp.js +50 -1
- package/dist/upgrader-gcp.js.map +1 -1
- package/dist/upgrader-iam-preflight.d.ts.map +1 -1
- package/dist/upgrader-iam-preflight.js +6 -1
- package/dist/upgrader-iam-preflight.js.map +1 -1
- package/dist/upgrader-job.d.ts +1 -1
- package/dist/upgrader-job.d.ts.map +1 -1
- package/dist/upgrader-job.js +20 -14
- package/dist/upgrader-job.js.map +1 -1
- package/dist/upgrader-records.d.ts +1 -1
- package/dist/upgrader-records.d.ts.map +1 -1
- package/dist/upgrader-records.js +26 -7
- package/dist/upgrader-records.js.map +1 -1
- package/dist/upgrader-setup.d.ts.map +1 -1
- package/dist/upgrader-setup.js +10 -5
- package/dist/upgrader-setup.js.map +1 -1
- package/dist/wizard.d.ts +7 -0
- package/dist/wizard.d.ts.map +1 -1
- package/dist/wizard.js +11 -0
- package/dist/wizard.js.map +1 -1
- package/dist/wizards/gcp-cost.d.ts +31 -0
- package/dist/wizards/gcp-cost.d.ts.map +1 -1
- package/dist/wizards/gcp-cost.js +103 -18
- package/dist/wizards/gcp-cost.js.map +1 -1
- package/dist/wizards/gcp.d.ts.map +1 -1
- package/dist/wizards/gcp.js +129 -27
- package/dist/wizards/gcp.js.map +1 -1
- package/package.json +2 -2
- package/src/adapter.ts +6 -0
- package/src/admin-domain.test.ts +9 -8
- package/src/admin-domain.ts +13 -3
- package/src/admin-memory.test.ts +2 -1
- package/src/adopt-existing.test.ts +85 -0
- package/src/adopt-existing.ts +141 -3
- package/src/agent/command.test.ts +49 -1
- package/src/agent/command.ts +39 -9
- package/src/agent/run.test.ts +19 -0
- package/src/agent/run.ts +11 -2
- package/src/aws-task-roles.ts +5 -2
- package/src/caddy-redirects.docker.test.ts +2 -0
- package/src/caddy-redirects.test.ts +4 -1
- package/src/caddy-validate.test.ts +7 -1
- package/src/caddy.test.ts +39 -1
- package/src/caddy.ts +36 -4
- package/src/checkpoint-secrets.test.ts +14 -6
- package/src/cli-routing.test.ts +1 -1
- package/src/cli-routing.ts +1 -1
- package/src/cli.ts +71 -5
- package/src/cloudsql-tls.test.ts +255 -0
- package/src/cloudsql-tls.ts +359 -0
- package/src/compose.ts +193 -24
- package/src/converge-checkpoint.ts +8 -1
- package/src/converge-db-trust.test.ts +237 -0
- package/src/converge-db-trust.ts +212 -0
- package/src/converge-job-gcp.ts +11 -12
- package/src/converge-job-preflight.test.ts +5 -0
- package/src/converge-job-preflight.ts +8 -0
- package/src/converge-job.test.ts +70 -0
- package/src/converge-job.ts +32 -0
- package/src/database-tls-builders.test.ts +56 -0
- package/src/deployed-release.test.ts +107 -40
- package/src/deployed-release.ts +30 -9
- package/src/gateway-env-isolation.test.ts +50 -12
- package/src/gcp-names.ts +56 -0
- package/src/gcp-url-map.test.ts +6 -8
- package/src/gcp-url-map.ts +6 -2
- package/src/index.test.ts +10 -4
- package/src/index.ts +7 -0
- package/src/infra-contract.test.ts +7 -3
- package/src/infra-contract.ts +45 -1
- package/src/install-job.ts +4 -1
- package/src/install-state.ts +33 -4
- package/src/lifecycle.ts +23 -11
- package/src/mcp-auth-proxy-setup.test.ts +305 -0
- package/src/mcp-auth-proxy-setup.ts +374 -0
- package/src/mcp-iap-stacks.test.ts +1 -1
- package/src/media-volume.test.ts +1 -1
- package/src/migration-runner.ts +14 -9
- package/src/migration-targets.ts +12 -0
- package/src/operator-access-stacks.test.ts +1 -1
- package/src/operator-access.test.ts +20 -4
- package/src/operator-access.ts +14 -0
- package/src/pool-budget-stack.ts +15 -0
- package/src/pool-budget-stacks.test.ts +39 -14
- package/src/public-role-isolation.test.ts +18 -8
- package/src/public-role-isolation.ts +31 -17
- package/src/release-contract.ts +3 -0
- package/src/release-manifest.test.ts +25 -0
- package/src/release-manifest.ts +59 -4
- package/src/remote-mcp-stack-config.test.ts +19 -9
- package/src/remote-mcp.test.ts +252 -57
- package/src/remote-mcp.ts +336 -77
- package/src/runtime-secrets.test.ts +37 -14
- package/src/runtime-secrets.ts +87 -27
- package/src/scheduler-setup.test.ts +201 -0
- package/src/scheduler-setup.ts +375 -0
- package/src/seal-key-rotation.test.ts +2 -2
- package/src/seal-key-rotation.ts +25 -25
- package/src/self-hosted-backup.test.ts +1 -0
- package/src/self-hosted-compose.test.ts +180 -6
- package/src/self-hosted-db-tls.test.ts +111 -0
- package/src/self-hosted-db-tls.ts +287 -0
- package/src/self-hosted-release-resolve.test.ts +71 -0
- package/src/self-hosted-release.ts +41 -11
- package/src/self-hosted-roles.integration.test.ts +2 -0
- package/src/self-hosted-roles.test.ts +87 -3
- package/src/self-hosted-roles.ts +101 -3
- package/src/self-hosted-scheduler-interval.test.ts +66 -0
- package/src/self-hosted-scheduler-interval.ts +79 -0
- package/src/self-hosted-start.test.ts +35 -2
- package/src/self-hosted-start.ts +20 -2
- package/src/self-hosted-upgrade.test.ts +104 -14
- package/src/self-hosted-upgrade.ts +123 -31
- package/src/stack-contract-parity.test.ts +79 -12
- package/src/stack-contract.test.ts +199 -31
- package/src/stack-contract.ts +472 -45
- package/src/stack-converge-secrets.test.ts +28 -13
- package/src/stack-converge.test.ts +203 -28
- package/src/stack-converge.ts +92 -30
- package/src/staging-database.test.ts +114 -0
- package/src/staging-database.ts +148 -0
- package/src/state-store.test.ts +2 -1
- package/src/upgrade/app-roll.ts +97 -19
- package/src/upgrade/converge.ts +249 -19
- package/src/upgrade/health.test.ts +63 -25
- package/src/upgrade/health.ts +54 -22
- package/src/upgrade/image-forms.test.ts +34 -0
- package/src/upgrade/image-forms.ts +23 -8
- package/src/upgrade/release-images.test.ts +5 -1
- package/src/upgrade/release-images.ts +22 -6
- package/src/upgrade/upgrade.test.ts +438 -46
- package/src/upgrade/upgrade.ts +64 -6
- package/src/upgrader-gcp.ts +66 -3
- package/src/upgrader-iam-preflight.test.ts +19 -0
- package/src/upgrader-iam-preflight.ts +6 -0
- package/src/upgrader-job.test.ts +101 -27
- package/src/upgrader-job.ts +27 -14
- package/src/upgrader-records.test.ts +97 -12
- package/src/upgrader-records.ts +28 -11
- package/src/upgrader-setup.test.ts +2 -0
- package/src/upgrader-setup.ts +10 -4
- package/src/wizard.ts +19 -0
- package/src/wizards/gcp-cost.test.ts +103 -0
- package/src/wizards/gcp-cost.ts +125 -18
- package/src/wizards/gcp.ts +164 -22
- package/stacks/aws/Pulumi.yaml +1 -1
- package/stacks/aws/index.ts +72 -14
- package/stacks/azure/index.ts +108 -21
- package/stacks/gcp/Pulumi.yaml +1 -1
- package/stacks/gcp/README.md +1 -0
- package/stacks/gcp/index.ts +133 -24
- package/stacks/gcp-firebase/Pulumi.yaml +1 -1
- package/stacks/gcp-firebase/index.ts +212 -34
- package/stacks/self-hosted/Pulumi.yaml +3 -0
- package/stacks/self-hosted/README.md +6 -1
- package/stacks/self-hosted/index.ts +40 -5
package/dist/compose.d.ts
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { type ReleaseService } from "./upgrade/release-images.js";
|
|
2
|
-
/** The
|
|
2
|
+
/** The release images, each `ghcr.io/caelo-cms/<svc>@sha256:…`. */
|
|
3
3
|
export interface ReleaseImages {
|
|
4
4
|
readonly mode: "release";
|
|
5
5
|
readonly admin: string;
|
|
6
6
|
readonly gateway: string;
|
|
7
|
+
/**
|
|
8
|
+
* #1328 — the MCP-Auth-Proxy. Absent only for a release recorded before
|
|
9
|
+
* the proxy shipped (a rollback target in release.json): its Compose file
|
|
10
|
+
* then has no proxy service, exactly as that release ran.
|
|
11
|
+
*/
|
|
12
|
+
readonly "mcp-auth-proxy"?: string;
|
|
7
13
|
}
|
|
8
14
|
/**
|
|
9
15
|
* Contributor-only: run the admin + gateway from the Caelo checkout the
|
|
@@ -44,11 +50,18 @@ export declare const MEDIA_DIR = "media";
|
|
|
44
50
|
export declare const MEDIA_ROOT = "/data/media";
|
|
45
51
|
/** The gateway's HTTP port inside the Compose network. */
|
|
46
52
|
export declare const COMPOSE_GATEWAY_PORT = 8090;
|
|
53
|
+
/** #1328 — the MCP-Auth-Proxy's HTTP port inside the Compose network. */
|
|
54
|
+
export declare const COMPOSE_MCP_AUTH_PROXY_PORT = 8095;
|
|
55
|
+
/** #1328 — the Compose service name of the MCP-Auth-Proxy. */
|
|
56
|
+
export declare const COMPOSE_MCP_AUTH_PROXY_SERVICE = "caelo-mcp-auth-proxy";
|
|
47
57
|
/**
|
|
48
|
-
* The Compose services that
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
*
|
|
58
|
+
* The Compose services that touch the databases — what `backup` and
|
|
59
|
+
* `restore` stop while they read or rewrite them. Workers run inside the
|
|
60
|
+
* admin (CLAUDE.md §11.B Tier 5); there is no orchestrator or runner
|
|
61
|
+
* service. The MCP-Auth-Proxy (#1328) is deliberately not here: it holds no
|
|
62
|
+
* database login, so it keeps running, and a release from before it has no
|
|
63
|
+
* such service for `up` to start. Its health is checked wherever the
|
|
64
|
+
* install starts (self-hosted-start.ts) or rolls (self-hosted-upgrade.ts).
|
|
52
65
|
*/
|
|
53
66
|
export declare const COMPOSE_APP_SERVICES: readonly ["caelo-admin", "caelo-gateway"];
|
|
54
67
|
/**
|
|
@@ -58,6 +71,7 @@ export declare const COMPOSE_APP_SERVICES: readonly ["caelo-admin", "caelo-gatew
|
|
|
58
71
|
*/
|
|
59
72
|
export declare const COMPOSE_ADMIN_UPSTREAM = "caelo-admin:5173";
|
|
60
73
|
export declare const COMPOSE_GATEWAY_UPSTREAM = "caelo-gateway:8090";
|
|
74
|
+
export declare const COMPOSE_MCP_AUTH_PROXY_UPSTREAM = "caelo-mcp-auth-proxy:8095";
|
|
61
75
|
/**
|
|
62
76
|
* The Caddy image, pinned to the release the generated Caddyfile is
|
|
63
77
|
* validated against (caddy-validate.test.ts runs `caddy validate` on this
|
|
@@ -105,6 +119,8 @@ export declare function ghcrImageDigest(service: ReleaseService, ref: string): s
|
|
|
105
119
|
export interface RolePasswords {
|
|
106
120
|
readonly admin: string;
|
|
107
121
|
readonly public: string;
|
|
122
|
+
/** #1329 — public_staging_role's, the staging gateway's login on cms_public_staging. */
|
|
123
|
+
readonly publicStaging: string;
|
|
108
124
|
}
|
|
109
125
|
export interface ComposeSpec {
|
|
110
126
|
readonly domain: string;
|
|
@@ -125,6 +141,15 @@ export interface ComposeSpec {
|
|
|
125
141
|
* the gateway never gets it.
|
|
126
142
|
*/
|
|
127
143
|
readonly internalSecret: string;
|
|
144
|
+
/**
|
|
145
|
+
* #1338 — SHA-256 (hex) of the database server certificate the Postgres
|
|
146
|
+
* service mounts (`.caelo/postgres-tls/server.crt`). It is part of the
|
|
147
|
+
* service's environment so a renewed certificate changes the service's
|
|
148
|
+
* definition and `docker compose up -d` recreates Postgres: a bind-mounted
|
|
149
|
+
* file whose content changes does not, and Postgres would keep serving
|
|
150
|
+
* the old certificate until verify-full clients refuse it.
|
|
151
|
+
*/
|
|
152
|
+
readonly dbTlsServerCertSha256: string;
|
|
128
153
|
readonly anthropicApiKey?: string;
|
|
129
154
|
readonly resendApiKey?: string;
|
|
130
155
|
readonly diskSize: string;
|
|
@@ -135,8 +160,14 @@ export interface ComposeSpec {
|
|
|
135
160
|
* busy host never OOM-kills the admin at the limit.
|
|
136
161
|
*/
|
|
137
162
|
readonly adminMemory?: string;
|
|
138
|
-
/** Which
|
|
163
|
+
/** Which Caelo images run (see {@link ComposeImages}). */
|
|
139
164
|
readonly images: ComposeImages;
|
|
165
|
+
/**
|
|
166
|
+
* #1140 — the `schedulerIntervalMinutes` knob: how often the scheduler
|
|
167
|
+
* container calls the admin's tick (1–15, default 5; stack-contract.ts
|
|
168
|
+
* SCHEDULER_INTERVAL_MINUTES).
|
|
169
|
+
*/
|
|
170
|
+
readonly schedulerIntervalMinutes?: number;
|
|
140
171
|
/**
|
|
141
172
|
* The host ports Caddy listens on (`80` / `443` for a public install —
|
|
142
173
|
* ACME's HTTP and TLS-ALPN challenges need exactly those).
|
|
@@ -162,4 +193,10 @@ export declare const AGENT_DB_BIND_ADDRESS = "127.0.0.1";
|
|
|
162
193
|
export declare function generateDockerCompose(spec: ComposeSpec): string;
|
|
163
194
|
/** Whether `port` may carry the agent's Postgres (unprivileged TCP port). */
|
|
164
195
|
export declare function isAgentDbPort(port: number): boolean;
|
|
196
|
+
/** #1140 — the Compose service that calls the admin's scheduler tick. */
|
|
197
|
+
export declare const COMPOSE_SCHEDULER_SERVICE = "caelo-scheduler";
|
|
198
|
+
/** Where the admin image (and the dev checkout) ships the scheduler clock. */
|
|
199
|
+
export declare const SCHEDULER_CLOCK_SCRIPT = "packages/admin-core/src/scheduler/clock.ts";
|
|
200
|
+
/** The admin's tick endpoint on the Compose network. */
|
|
201
|
+
export declare const COMPOSE_SCHEDULER_TICK_URL = "http://caelo-admin:5173/api/internal/scheduler/tick";
|
|
165
202
|
//# sourceMappingURL=compose.d.ts.map
|
package/dist/compose.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compose.d.ts","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"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"}
|
package/dist/compose.js
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* P14 — production docker-compose.yml generator.
|
|
4
4
|
*
|
|
5
|
-
* Emits the production stack: Postgres + Caddy + the
|
|
6
|
-
* (admin, gateway). Idempotent: same
|
|
7
|
-
* byte-identical output. The CLI's `init` / `up` / `upgrade` sub-commands
|
|
5
|
+
* Emits the production stack: Postgres + Caddy + the Caelo services
|
|
6
|
+
* (admin, gateway and — #1328 — the MCP-Auth-Proxy). Idempotent: same
|
|
7
|
+
* input → byte-identical output. The CLI's `init` / `up` / `upgrade` sub-commands
|
|
8
8
|
* write this to `.caelo/docker-compose.yml`.
|
|
9
9
|
*
|
|
10
10
|
* #696 — the admin and gateway run the PREBUILT, cosign-verified release
|
|
@@ -25,10 +25,11 @@
|
|
|
25
25
|
* and its `minio/minio` image is no longer published, so the service made
|
|
26
26
|
* every fresh `docker compose up` fail.
|
|
27
27
|
*/
|
|
28
|
-
import { CADDY_REDIRECTS_FILE } from "@caelo-cms/shared";
|
|
28
|
+
import { CADDY_REDIRECTS_FILE, SELF_HOSTED_CA_FILE, verifyFullQuery } from "@caelo-cms/shared";
|
|
29
29
|
import { caddyRedirectReloadCommand } from "./caddy-redirects.js";
|
|
30
30
|
import { DEFAULT_MAX_CONNECTIONS, stackPoolBudget } from "./pool-budget-stack.js";
|
|
31
|
-
import {
|
|
31
|
+
import { SELF_HOSTED_DB_HOST, SELF_HOSTED_TLS_DIR, SELF_HOSTED_TLS_FILES, } from "./self-hosted-db-tls.js";
|
|
32
|
+
import { ADMIN_MEMORY_DEFAULT, GATEWAY_ENVIRONMENT_ENV, GATEWAY_TRUSTED_PROXY_HOPS, MCP_AUTH_PROXY_TRUSTED_PROXY_HOPS, memoryQuantityMiB, parseSchedulerIntervalMinutes, publicSiteUrl, REMOTE_MCP_MODE, REMOTE_MCP_MODE_ENV, TRUSTED_PROXY_HOPS_ENV, } from "./stack-contract.js";
|
|
32
33
|
import { ghcrRepository, isImageDigest } from "./upgrade/release-images.js";
|
|
33
34
|
/** The admin's HTTP port inside the Compose network (the Caddyfile proxies to it). */
|
|
34
35
|
export const COMPOSE_ADMIN_PORT = 5173;
|
|
@@ -42,6 +43,8 @@ export const COMPOSE_POOL_BUDGET = stackPoolBudget("self-hosted", {
|
|
|
42
43
|
maxConnections: DEFAULT_MAX_CONNECTIONS["self-hosted"],
|
|
43
44
|
adminMaxInstances: 1,
|
|
44
45
|
gatewayMaxInstances: 1,
|
|
46
|
+
// #1329 — one staging gateway container (P3b-2) next to the live one.
|
|
47
|
+
stagingGatewayMaxInstances: 1,
|
|
45
48
|
});
|
|
46
49
|
/** The budget's env as Compose `environment:` lines for `service`. */
|
|
47
50
|
function poolEnvLines(service) {
|
|
@@ -68,11 +71,18 @@ export const MEDIA_DIR = "media";
|
|
|
68
71
|
export const MEDIA_ROOT = "/data/media";
|
|
69
72
|
/** The gateway's HTTP port inside the Compose network. */
|
|
70
73
|
export const COMPOSE_GATEWAY_PORT = 8090;
|
|
74
|
+
/** #1328 — the MCP-Auth-Proxy's HTTP port inside the Compose network. */
|
|
75
|
+
export const COMPOSE_MCP_AUTH_PROXY_PORT = 8095;
|
|
76
|
+
/** #1328 — the Compose service name of the MCP-Auth-Proxy. */
|
|
77
|
+
export const COMPOSE_MCP_AUTH_PROXY_SERVICE = "caelo-mcp-auth-proxy";
|
|
71
78
|
/**
|
|
72
|
-
* The Compose services that
|
|
73
|
-
*
|
|
74
|
-
*
|
|
75
|
-
*
|
|
79
|
+
* The Compose services that touch the databases — what `backup` and
|
|
80
|
+
* `restore` stop while they read or rewrite them. Workers run inside the
|
|
81
|
+
* admin (CLAUDE.md §11.B Tier 5); there is no orchestrator or runner
|
|
82
|
+
* service. The MCP-Auth-Proxy (#1328) is deliberately not here: it holds no
|
|
83
|
+
* database login, so it keeps running, and a release from before it has no
|
|
84
|
+
* such service for `up` to start. Its health is checked wherever the
|
|
85
|
+
* install starts (self-hosted-start.ts) or rolls (self-hosted-upgrade.ts).
|
|
76
86
|
*/
|
|
77
87
|
export const COMPOSE_APP_SERVICES = ["caelo-admin", "caelo-gateway"];
|
|
78
88
|
/**
|
|
@@ -82,6 +92,7 @@ export const COMPOSE_APP_SERVICES = ["caelo-admin", "caelo-gateway"];
|
|
|
82
92
|
*/
|
|
83
93
|
export const COMPOSE_ADMIN_UPSTREAM = `caelo-admin:${COMPOSE_ADMIN_PORT}`;
|
|
84
94
|
export const COMPOSE_GATEWAY_UPSTREAM = `caelo-gateway:${COMPOSE_GATEWAY_PORT}`;
|
|
95
|
+
export const COMPOSE_MCP_AUTH_PROXY_UPSTREAM = `${COMPOSE_MCP_AUTH_PROXY_SERVICE}:${COMPOSE_MCP_AUTH_PROXY_PORT}`;
|
|
85
96
|
/**
|
|
86
97
|
* The Caddy image, pinned to the release the generated Caddyfile is
|
|
87
98
|
* validated against (caddy-validate.test.ts runs `caddy validate` on this
|
|
@@ -161,6 +172,9 @@ export function generateDockerCompose(spec) {
|
|
|
161
172
|
if (spec.internalSecret.length < 32) {
|
|
162
173
|
throw new Error("internalSecret is shorter than 32 characters (.caelo/internal-secret.json)");
|
|
163
174
|
}
|
|
175
|
+
if (!/^[0-9a-f]{64}$/.test(spec.dbTlsServerCertSha256)) {
|
|
176
|
+
throw new Error("dbTlsServerCertSha256 is not a SHA-256 hex digest of .caelo/postgres-tls/server.crt");
|
|
177
|
+
}
|
|
164
178
|
return `# SPDX-License-Identifier: MPL-2.0
|
|
165
179
|
# Generated by cms-provision — do not edit; re-run \`bunx cms-provision up\`.
|
|
166
180
|
# Domain: ${spec.domain}
|
|
@@ -168,10 +182,16 @@ export function generateDockerCompose(spec) {
|
|
|
168
182
|
name: ${spec.project}
|
|
169
183
|
|
|
170
184
|
services:
|
|
171
|
-
|
|
185
|
+
${SELF_HOSTED_DB_HOST}:
|
|
172
186
|
image: postgres:16-alpine
|
|
173
|
-
#
|
|
174
|
-
|
|
187
|
+
# #1338 — TLS with the install's own certificate for the host name
|
|
188
|
+
# \`${SELF_HOSTED_DB_HOST}\` (self-hosted-db-tls.ts); every client connects with
|
|
189
|
+
# verify-full. Postgres refuses a key file it does not own, and a bind
|
|
190
|
+
# mount keeps the host's owner, so the entrypoint copies the pair to a
|
|
191
|
+
# container-local path owned by postgres first.
|
|
192
|
+
entrypoint: ${POSTGRES_TLS_ENTRYPOINT}
|
|
193
|
+
# The pool budget (COMPOSE_POOL_BUDGET) is computed from max_connections.
|
|
194
|
+
command: ["postgres", "-c", "max_connections=${DEFAULT_MAX_CONNECTIONS["self-hosted"]}", "-c", "ssl=on", "-c", "ssl_cert_file=${POSTGRES_TLS_RUNTIME_DIR}/server.crt", "-c", "ssl_key_file=${POSTGRES_TLS_RUNTIME_DIR}/server.key", "-c", "ssl_min_protocol_version=TLSv1.2"]
|
|
175
195
|
restart: unless-stopped
|
|
176
196
|
environment:
|
|
177
197
|
POSTGRES_PASSWORD: "${escapeYaml(spec.postgresPassword)}"
|
|
@@ -179,9 +199,14 @@ services:
|
|
|
179
199
|
POSTGRES_DB: caelo
|
|
180
200
|
ADMIN_ROLE_PASSWORD: "${escapeYaml(spec.rolePasswords.admin)}"
|
|
181
201
|
PUBLIC_ROLE_PASSWORD: "${escapeYaml(spec.rolePasswords.public)}"
|
|
202
|
+
PUBLIC_STAGING_ROLE_PASSWORD: "${escapeYaml(spec.rolePasswords.publicStaging)}"
|
|
203
|
+
# Recreates Postgres when its certificate is renewed (see the spec).
|
|
204
|
+
CAELO_DB_TLS_SERVER_CERT_SHA256: "${spec.dbTlsServerCertSha256}"
|
|
182
205
|
${postgresAgent(spec.agent)} volumes:
|
|
183
206
|
- caelo-pg:/var/lib/postgresql/data
|
|
184
207
|
- ./bootstrap.sh:/docker-entrypoint-initdb.d/00_bootstrap.sh:ro
|
|
208
|
+
- ./${SELF_HOSTED_TLS_DIR}/${SELF_HOSTED_TLS_FILES.serverCert}:${POSTGRES_TLS_MOUNT_DIR}/server.crt:ro
|
|
209
|
+
- ./${SELF_HOSTED_TLS_DIR}/${SELF_HOSTED_TLS_FILES.serverKey}:${POSTGRES_TLS_MOUNT_DIR}/server.key:ro
|
|
185
210
|
healthcheck:
|
|
186
211
|
test: ["CMD-SHELL", "pg_isready -U caelo"]
|
|
187
212
|
interval: 10s
|
|
@@ -204,7 +229,8 @@ ${postgresAgent(spec.agent)} volumes:
|
|
|
204
229
|
${adminService(spec, adminMemoryMiB, env)}
|
|
205
230
|
|
|
206
231
|
${gatewayService(spec)}
|
|
207
|
-
|
|
232
|
+
${mcpAuthProxyService(spec.images)}
|
|
233
|
+
${schedulerService(spec)}
|
|
208
234
|
volumes:
|
|
209
235
|
caelo-pg:
|
|
210
236
|
caelo-caddy-data:
|
|
@@ -246,9 +272,10 @@ function serviceRuntime(images, service, devCommand, mounts = []) {
|
|
|
246
272
|
...volumes(["../..:/app", ...mounts]),
|
|
247
273
|
].join("\n");
|
|
248
274
|
}
|
|
249
|
-
const
|
|
275
|
+
const ref = images[service] ?? "";
|
|
276
|
+
const digest = ghcrImageDigest(service, ref);
|
|
250
277
|
if (!digest) {
|
|
251
|
-
throw new Error(`${service} image ${JSON.stringify(
|
|
278
|
+
throw new Error(`${service} image ${JSON.stringify(ref)} is not ${ghcrRepository(service)}@sha256:<digest>`);
|
|
252
279
|
}
|
|
253
280
|
// The image's own CMD starts the service; no source is mounted.
|
|
254
281
|
return [` image: ${ghcrImageRef(service, digest)}`, ...volumes(mounts)].join("\n");
|
|
@@ -269,6 +296,7 @@ ${serviceRuntime(spec.images, "admin", `sh -c "cd apps/admin && bunx svelte-kit
|
|
|
269
296
|
`./${BOOTSTRAP_DIR}:/app/.caelo`,
|
|
270
297
|
`./output:${SITE_OUTPUT_ROOT}`,
|
|
271
298
|
`./${MEDIA_DIR}:${MEDIA_ROOT}`,
|
|
299
|
+
DATABASE_CA_MOUNT,
|
|
272
300
|
])}
|
|
273
301
|
restart: unless-stopped
|
|
274
302
|
depends_on:
|
|
@@ -277,6 +305,8 @@ ${serviceRuntime(spec.images, "admin", `sh -c "cd apps/admin && bunx svelte-kit
|
|
|
277
305
|
environment:
|
|
278
306
|
ADMIN_DATABASE_URL: "${dbUrl("admin_role", spec.rolePasswords.admin, "cms_admin")}"
|
|
279
307
|
PUBLIC_ADMIN_DATABASE_URL: "${dbUrl("admin_role", spec.rolePasswords.admin, "cms_public")}"
|
|
308
|
+
# #1329 — the staging database's plugin schemas and projection.
|
|
309
|
+
PUBLIC_STAGING_ADMIN_DATABASE_URL: "${dbUrl("admin_role", spec.rolePasswords.admin, "cms_public_staging")}"
|
|
280
310
|
CAELO_SECRET_KEK: "${escapeYaml(spec.caeloSecretKek)}"
|
|
281
311
|
CAELO_INTERNAL_SECRET: "${escapeYaml(spec.internalSecret)}"
|
|
282
312
|
CAELO_SITE_URL: "${escapeYaml(selfHostedSiteUrl(spec.domain, spec.ports.https))}"
|
|
@@ -291,7 +321,7 @@ ${env("RESEND_API_KEY", spec.resendApiKey)}`;
|
|
|
291
321
|
}
|
|
292
322
|
function gatewayService(spec) {
|
|
293
323
|
return ` caelo-gateway:
|
|
294
|
-
${serviceRuntime(spec.images, "gateway", "bun run apps/api-gateway/src/server.ts")}
|
|
324
|
+
${serviceRuntime(spec.images, "gateway", "bun run apps/api-gateway/src/server.ts", [DATABASE_CA_MOUNT])}
|
|
295
325
|
restart: unless-stopped
|
|
296
326
|
depends_on:
|
|
297
327
|
postgres: { condition: service_healthy }
|
|
@@ -299,21 +329,116 @@ ${serviceRuntime(spec.images, "gateway", "bun run apps/api-gateway/src/server.ts
|
|
|
299
329
|
# public_role on cms_public is its only database login (#613, #635,
|
|
300
330
|
# CLAUDE.md §2: the public side has no path to the authoring database).
|
|
301
331
|
PUBLIC_DATABASE_URL: "${dbUrl("public_role", spec.rolePasswords.public, "cms_public")}"
|
|
332
|
+
# #1329 — the live site's gateway: it refuses anything of the staging data.
|
|
333
|
+
${GATEWAY_ENVIRONMENT_ENV}: "live"
|
|
302
334
|
GATEWAY_PORT: "${COMPOSE_GATEWAY_PORT}"
|
|
303
335
|
# Caddy is the one proxy in front (client-ip.ts in the gateway).
|
|
304
336
|
${TRUSTED_PROXY_HOPS_ENV}: "${GATEWAY_TRUSTED_PROXY_HOPS["self-hosted"]}"
|
|
305
337
|
${poolEnvLines("gateway")}
|
|
306
|
-
# #806 — no remote MCP here: it rides Google IAP, which this install
|
|
307
|
-
# does not have. CAELO_ADMIN_URL / CAELO_MCP_PUBLIC_URL /
|
|
308
|
-
# CAELO_OPERATOR_OAUTH_CLIENT_FILE stay unset, so the gateway's /api/mcp/*
|
|
309
|
-
# answers 503 remote_mcp_not_configured and Settings → MCP says
|
|
310
|
-
# "not available on this install".
|
|
311
338
|
NODE_ENV: production`;
|
|
312
339
|
}
|
|
313
|
-
/**
|
|
340
|
+
/**
|
|
341
|
+
* #1328 — the MCP-Auth-Proxy: remote MCP's sign-in broker, its own
|
|
342
|
+
* container so it never shares a process with visitor handlers. Remote MCP
|
|
343
|
+
* needs the admin behind Google IAP, which a Compose install does not have,
|
|
344
|
+
* so it runs with `CAELO_REMOTE_MCP=unavailable` and answers every request
|
|
345
|
+
* but its health check with one fixed 404 (E14 a of #763: the service
|
|
346
|
+
* exists on every provider, its attack surface one branch). Caddy serves it
|
|
347
|
+
* on its own host (`mcp.<domain>`, caddy.ts), never on the site's origin.
|
|
348
|
+
*
|
|
349
|
+
* It gets no database URL, no secret and no mount: there is nothing it
|
|
350
|
+
* could read. The container is locked down on top — read-only root
|
|
351
|
+
* filesystem, every capability dropped, no privilege escalation — because
|
|
352
|
+
* it is the Caelo service that holds operators' Google tokens wherever
|
|
353
|
+
* remote MCP runs. Empty for a release recorded before the proxy shipped
|
|
354
|
+
* ({@link ReleaseImages}).
|
|
355
|
+
*/
|
|
356
|
+
function mcpAuthProxyService(images) {
|
|
357
|
+
if (images.mode === "release" && images["mcp-auth-proxy"] === undefined)
|
|
358
|
+
return "";
|
|
359
|
+
return `
|
|
360
|
+
${COMPOSE_MCP_AUTH_PROXY_SERVICE}:
|
|
361
|
+
${serviceRuntime(images, "mcp-auth-proxy", "bun run apps/mcp-auth-proxy/src/server.ts")}
|
|
362
|
+
restart: unless-stopped
|
|
363
|
+
read_only: true
|
|
364
|
+
tmpfs: ["/tmp"]
|
|
365
|
+
cap_drop: ["ALL"]
|
|
366
|
+
security_opt: ["no-new-privileges:true"]
|
|
367
|
+
environment:
|
|
368
|
+
CAELO_PROVIDER: "self-hosted"
|
|
369
|
+
${REMOTE_MCP_MODE_ENV}: "${REMOTE_MCP_MODE["self-hosted"]}"
|
|
370
|
+
MCP_AUTH_PROXY_PORT: "${COMPOSE_MCP_AUTH_PROXY_PORT}"
|
|
371
|
+
# Caddy is the one proxy in front (@caelo-cms/shared client-address.ts).
|
|
372
|
+
${TRUSTED_PROXY_HOPS_ENV}: "${MCP_AUTH_PROXY_TRUSTED_PROXY_HOPS["self-hosted"]}"
|
|
373
|
+
NODE_ENV: production
|
|
374
|
+
`;
|
|
375
|
+
}
|
|
376
|
+
/** #1140 — the Compose service that calls the admin's scheduler tick. */
|
|
377
|
+
export const COMPOSE_SCHEDULER_SERVICE = "caelo-scheduler";
|
|
378
|
+
/** Where the admin image (and the dev checkout) ships the scheduler clock. */
|
|
379
|
+
export const SCHEDULER_CLOCK_SCRIPT = "packages/admin-core/src/scheduler/clock.ts";
|
|
380
|
+
/** The admin's tick endpoint on the Compose network. */
|
|
381
|
+
export const COMPOSE_SCHEDULER_TICK_URL = `http://${COMPOSE_ADMIN_UPSTREAM}/api/internal/scheduler/tick`;
|
|
382
|
+
/**
|
|
383
|
+
* #1140 — the scheduler: the self-hosted counterpart of the Cloud Scheduler
|
|
384
|
+
* job on Google Cloud. Every `schedulerIntervalMinutes` it POSTs the admin's
|
|
385
|
+
* `/api/internal/scheduler/tick` with an internal token (scope
|
|
386
|
+
* `scheduler.tick`); the admin runs whatever its due-table says is due. The
|
|
387
|
+
* clock only calls, it does no work itself, so the admin's background work
|
|
388
|
+
* runs inside a request on every provider.
|
|
389
|
+
*
|
|
390
|
+
* It runs the admin image with another entry point (dependency-free, node
|
|
391
|
+
* built-ins only) and holds only the internal secret it signs with: no
|
|
392
|
+
* database URL, no KEK, no mount, read-only root filesystem, every
|
|
393
|
+
* capability dropped. A rollback to a release from before #1140 renders it
|
|
394
|
+
* too; that admin image has no clock script, so the container exits and
|
|
395
|
+
* Docker restarts it with back-off — that release runs its work in-process.
|
|
396
|
+
*/
|
|
397
|
+
function schedulerService(spec) {
|
|
398
|
+
const minutes = parseSchedulerIntervalMinutes(spec.schedulerIntervalMinutes);
|
|
399
|
+
const runtime = spec.images.mode === "dev"
|
|
400
|
+
? serviceRuntime(spec.images, "admin", `bun run ${SCHEDULER_CLOCK_SCRIPT}`)
|
|
401
|
+
: [
|
|
402
|
+
serviceRuntime(spec.images, "admin", ""),
|
|
403
|
+
` command: ["bun", "--bun", "/app/${SCHEDULER_CLOCK_SCRIPT}"]`,
|
|
404
|
+
].join("\n");
|
|
405
|
+
return `
|
|
406
|
+
${COMPOSE_SCHEDULER_SERVICE}:
|
|
407
|
+
${runtime}
|
|
408
|
+
restart: unless-stopped
|
|
409
|
+
read_only: true
|
|
410
|
+
tmpfs: ["/tmp"]
|
|
411
|
+
cap_drop: ["ALL"]
|
|
412
|
+
security_opt: ["no-new-privileges:true"]
|
|
413
|
+
depends_on: [caelo-admin]
|
|
414
|
+
environment:
|
|
415
|
+
CAELO_INTERNAL_SECRET: "${escapeYaml(spec.internalSecret)}"
|
|
416
|
+
CAELO_SCHEDULER_TICK_URL: "${COMPOSE_SCHEDULER_TICK_URL}"
|
|
417
|
+
CAELO_SCHEDULER_INTERVAL_MINUTES: "${minutes}"
|
|
418
|
+
NODE_ENV: production
|
|
419
|
+
`;
|
|
420
|
+
}
|
|
421
|
+
/**
|
|
422
|
+
* A compose-network database URL, password URL-encoded and YAML-escaped.
|
|
423
|
+
* #1338 — verify-full against the install's own CA (self-hosted-db-tls.ts),
|
|
424
|
+
* mounted at shared `SELF_HOSTED_CA_FILE` ({@link DATABASE_CA_MOUNT}).
|
|
425
|
+
*/
|
|
314
426
|
function dbUrl(role, password, database) {
|
|
315
|
-
return escapeYaml(`postgres://${role}:${encodeURIComponent(password)}
|
|
427
|
+
return escapeYaml(`postgres://${role}:${encodeURIComponent(password)}@${SELF_HOSTED_DB_HOST}:5432/${database}?${verifyFullQuery(SELF_HOSTED_CA_FILE)}`);
|
|
316
428
|
}
|
|
429
|
+
/** Where the server certificate + key are bind-mounted into Postgres (host-owned). */
|
|
430
|
+
const POSTGRES_TLS_MOUNT_DIR = "/caelo-tls";
|
|
431
|
+
/** Where the entrypoint copies them, owned by postgres (Postgres refuses others' keys). */
|
|
432
|
+
const POSTGRES_TLS_RUNTIME_DIR = "/var/lib/postgresql/caelo-tls";
|
|
433
|
+
/** The Postgres entrypoint: copy the TLS pair into place, then the image's own entrypoint. */
|
|
434
|
+
const POSTGRES_TLS_ENTRYPOINT = JSON.stringify([
|
|
435
|
+
"/bin/sh",
|
|
436
|
+
"-c",
|
|
437
|
+
`install -d -o postgres -g postgres -m 0700 ${POSTGRES_TLS_RUNTIME_DIR} && install -o postgres -g postgres -m 0644 ${POSTGRES_TLS_MOUNT_DIR}/server.crt ${POSTGRES_TLS_RUNTIME_DIR}/server.crt && install -o postgres -g postgres -m 0600 ${POSTGRES_TLS_MOUNT_DIR}/server.key ${POSTGRES_TLS_RUNTIME_DIR}/server.key && exec docker-entrypoint.sh "$$@"`,
|
|
438
|
+
"--",
|
|
439
|
+
]);
|
|
440
|
+
/** The install's database CA, read-only, where every verify-full URL names it. */
|
|
441
|
+
const DATABASE_CA_MOUNT = `./${SELF_HOSTED_TLS_DIR}/${SELF_HOSTED_TLS_FILES.caCert}:${SELF_HOSTED_CA_FILE}:ro`;
|
|
317
442
|
function escapeYaml(s) {
|
|
318
443
|
// Conservative escape for double-quoted YAML strings.
|
|
319
444
|
return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
|
package/dist/compose.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../src/compose.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converge-checkpoint.d.ts","sourceRoot":"","sources":["../src/converge-checkpoint.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD,eAAO,MAAM,wBAAwB
|
|
1
|
+
{"version":3,"file":"converge-checkpoint.d.ts","sourceRoot":"","sources":["../src/converge-checkpoint.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsBnC,CAAC;AACH;;;GAGG;AACH,eAAO,MAAM,qBAAqB,aAAa,CAAC;AAEhD,iDAAiD;AACjD,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE1E,kDAAkD;AAClD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,yEAAyE;AACzE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,kBAAkB,GAAG,IAAI,CAEjG;AAED,8BAA8B;AAC9B,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,kBAAkB,EAC9B,GAAG,EAAE,UAAU,GACd,IAAI,CAEN"}
|
|
@@ -39,7 +39,14 @@ export const ConvergeCheckpointSchema = InstallJobStatusSchema.extend({
|
|
|
39
39
|
backupId: z.string().min(1),
|
|
40
40
|
})
|
|
41
41
|
.optional(),
|
|
42
|
-
priorRevisions: z
|
|
42
|
+
priorRevisions: z
|
|
43
|
+
.object({
|
|
44
|
+
admin: z.string().min(1),
|
|
45
|
+
gateway: z.string().min(1),
|
|
46
|
+
// #1328 — absent in a checkpoint an older release wrote.
|
|
47
|
+
"mcp-auth-proxy": z.string().min(1).optional(),
|
|
48
|
+
})
|
|
49
|
+
.optional(),
|
|
43
50
|
});
|
|
44
51
|
/**
|
|
45
52
|
* The ops-bucket prefix of the converge job's own files — outside the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converge-checkpoint.js","sourceRoot":"","sources":["../src/converge-checkpoint.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAG/F,MAAM,OAAO,GAAG,4CAA4C,CAAC;AAE7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC,MAAM,CAAC;IACpE,0CAA0C;IAC1C,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IACxC,4FAA4F;IAC5F,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IACtC,+DAA+D;IAC/D,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;IAC5B,MAAM,EAAE,CAAC;SACN,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC5B,CAAC;SACD,QAAQ,EAAE;IACb,cAAc,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"converge-checkpoint.js","sourceRoot":"","sources":["../src/converge-checkpoint.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAG/F,MAAM,OAAO,GAAG,4CAA4C,CAAC;AAE7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC,MAAM,CAAC;IACpE,0CAA0C;IAC1C,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IACxC,4FAA4F;IAC5F,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IACtC,+DAA+D;IAC/D,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE;IAC5B,MAAM,EAAE,CAAC;SACN,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KAC5B,CAAC;SACD,QAAQ,EAAE;IACb,cAAc,EAAE,CAAC;SACd,MAAM,CAAC;QACN,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1B,yDAAyD;QACzD,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;KAC/C,CAAC;SACD,QAAQ,EAAE;CACd,CAAC,CAAC;AACH;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAKhD,kDAAkD;AAClD,MAAM,UAAU,qBAAqB,CAAC,MAAc;IAClD,OAAO,QAAQ,MAAM,IAAI,qBAAqB,oBAAoB,CAAC;AACrE,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,sBAAsB,CAAC,MAAc,EAAE,GAAe;IACpE,OAAO,gBAAgB,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,wBAAwB,EAAE,GAAG,CAAC,CAAC;AACxF,CAAC;AAED,8BAA8B;AAC9B,MAAM,UAAU,uBAAuB,CACrC,MAAc,EACd,UAA8B,EAC9B,GAAe;IAEf,iBAAiB,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,wBAAwB,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;AAC9F,CAAC"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import type { GcloudRunner } from "./gcloud-retry.js";
|
|
2
|
+
import type { HttpFetch } from "./runtime-secrets.js";
|
|
3
|
+
import { type UpgraderPlacement } from "./upgrader-gcp.js";
|
|
4
|
+
/** How the converge job reaches the database. */
|
|
5
|
+
export type ConvergeDatabaseTarget =
|
|
6
|
+
/** The services dial the DNS name already: verify-full, nothing to set up. */
|
|
7
|
+
{
|
|
8
|
+
readonly kind: "dns";
|
|
9
|
+
readonly host: string;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* The services dial the instance's IP: connect there, verify the chain
|
|
13
|
+
* against `caPem` and, when `pinnedSha1` is set, the certificate's
|
|
14
|
+
* fingerprint (lower-case hex, no colons) against it.
|
|
15
|
+
*/
|
|
16
|
+
| {
|
|
17
|
+
readonly kind: "ip";
|
|
18
|
+
readonly host: string;
|
|
19
|
+
readonly caPem: string;
|
|
20
|
+
readonly pinnedSha1: readonly string[] | null;
|
|
21
|
+
};
|
|
22
|
+
export interface ConvergeDatabaseTargetDeps {
|
|
23
|
+
readonly run?: GcloudRunner;
|
|
24
|
+
readonly http?: HttpFetch;
|
|
25
|
+
/** The shipped shared-CA bundle (tests pass their own). */
|
|
26
|
+
readonly readSharedCaBundle?: () => string;
|
|
27
|
+
}
|
|
28
|
+
/** A SHA-1 fingerprint as hex without separators, lower case (`AB:CD…` and `abcd…` compare equal). */
|
|
29
|
+
export declare function normalizedSha1(fingerprint: string): string;
|
|
30
|
+
/**
|
|
31
|
+
* The host the install dials today and, when it is the instance's IP, the
|
|
32
|
+
* server identity the converge job's connection must verify there. Throws
|
|
33
|
+
* with what could not be read: without it the job must not connect.
|
|
34
|
+
*/
|
|
35
|
+
export declare function convergeDatabaseTarget(placement: Pick<UpgraderPlacement, "projectId" | "region">, deps?: ConvergeDatabaseTargetDeps): Promise<ConvergeDatabaseTarget>;
|
|
36
|
+
/**
|
|
37
|
+
* Why a server certificate with `fingerprint` (as `node:tls` prints it) is
|
|
38
|
+
* not the instance `target` names, or null when it is. Only for an `ip`
|
|
39
|
+
* target; the chain itself is checked against `caPem` by the TLS layer.
|
|
40
|
+
*/
|
|
41
|
+
export declare function serverIdentityProblem(target: Extract<ConvergeDatabaseTarget, {
|
|
42
|
+
kind: "ip";
|
|
43
|
+
}>, fingerprint: string): string | null;
|
|
44
|
+
//# sourceMappingURL=converge-db-trust.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"converge-db-trust.d.ts","sourceRoot":"","sources":["../src/converge-db-trust.ts"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,KAAK,iBAAiB,EAAwB,MAAM,mBAAmB,CAAC;AAEjF,iDAAiD;AACjD,MAAM,MAAM,sBAAsB;AAChC,8EAA8E;AAC5E;IAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AACjD;;;;GAIG;GACD;IACE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEN,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC;IAC1B,2DAA2D;IAC3D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,MAAM,CAAC;CAC5C;AAED,sGAAsG;AACtG,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,WAAW,GAAG,QAAQ,CAAC,EAC1D,IAAI,GAAE,0BAA+B,GACpC,OAAO,CAAC,sBAAsB,CAAC,CAoDjC;AA2DD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,OAAO,CAAC,sBAAsB,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,EACvD,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,IAAI,CAKf"}
|