|
|
|
@@ -187,18 +187,15 @@ After Docker install, re-SSH so the `docker` group membership takes effect.
|
|
|
|
|
|
|
|
|
|
### Apps
|
|
|
|
|
|
|
|
|
|
| App | Type | Hosts | Envs | Notes |
|
|
|
|
|
|-----|------|-------|------|-------|
|
|
|
|
|
| `company_site` | django (docker) | adama + roslin (+ ai-server-4080) | prod | active/active behind NPM; beta port reserved |
|
|
|
|
|
| `dta_service` | django (docker) | adama + roslin + ai-server-4080 | beta + prod | active/active behind NPM |
|
|
|
|
|
| `dta_webapp` | node/vite static | adama + roslin (+ ai-server-4080) | beta + prod | active/active; built to `/var/www/<env>.app.ditchtheagent/html`, served by web-static nginx |
|
|
|
|
|
| `scha` | django (docker) | adama + roslin + ai-server-4080 | prod | active/active behind NPM; beta port reserved |
|
|
|
|
|
| `chat_web_app` | node-static (CRA) | adama + roslin + ai-server-4080 | prod | active/active; built to `/var/www/<env>.chat.aimloperations/html`, served by web-static nginx; beta port reserved |
|
|
|
|
|
| `chat_backend` | django (docker) | adama + roslin + ai-server-4080 | prod | active/active behind NPM; Ollama via `OLLAMA_BASE_URL=http://10.0.0.128:11434`; beta port reserved |
|
|
|
|
|
| App | Type | Hosts | Notes |
|
|
|
|
|
|-----|------|-------|-------|
|
|
|
|
|
| `company_site` | django (docker) | adama + roslin | active/active behind NPM |
|
|
|
|
|
| `dta_service` | django (docker) | adama + roslin + ai-server-4080 | active/active behind NPM |
|
|
|
|
|
| `dta_webapp` | node/vite static | adama + roslin | active/active; built to `/var/www/<env>_dta_webapp`, served by web-static nginx |
|
|
|
|
|
|
|
|
|
|
Django apps use a **shared external Postgres** (via `DATABASE_URL` in each host's
|
|
|
|
|
env file) so active/active replicas share one database. Beta and prod never share
|
|
|
|
|
a DB.
|
|
|
|
|
Both environments (`beta`, `prod`) are deployed. Django apps use a **shared external
|
|
|
|
|
Postgres** (via `DATABASE_URL` in each host's env file) so active/active replicas
|
|
|
|
|
share one database.
|
|
|
|
|
|
|
|
|
|
### Data model
|
|
|
|
|
|
|
|
|
@@ -209,18 +206,11 @@ a DB.
|
|
|
|
|
|
|
|
|
|
### Ports
|
|
|
|
|
|
|
|
|
|
Reserved host ports for NPM upstreams. Ports must match across every host that
|
|
|
|
|
serves the same app+env. Rows marked *not deployed* keep the port free for a
|
|
|
|
|
future beta replica.
|
|
|
|
|
|
|
|
|
|
| App | beta | prod | Deployed on |
|
|
|
|
|
|-----|------|------|-------------|
|
|
|
|
|
| company_site | 8010 (*not deployed*) | 8000 | adama, roslin, ai-server-4080 |
|
|
|
|
|
| dta_service | 8011 | 8001 | adama, roslin, ai-server-4080 |
|
|
|
|
|
| scha | 8012 (*not deployed*) | 8002 | adama, roslin, ai-server-4080 |
|
|
|
|
|
| chat_backend | 8013 (*not deployed*) | 8003 | adama, roslin, ai-server-4080 |
|
|
|
|
|
| dta_webapp (nginx) | 8081 | 8080 | adama, roslin, ai-server-4080 |
|
|
|
|
|
| chat_web_app (nginx) | 8083 (*not deployed*) | 8082 | adama, roslin, ai-server-4080 |
|
|
|
|
|
| App | beta | prod |
|
|
|
|
|
|-----|------|------|
|
|
|
|
|
| company_site | 8010 | 8000 |
|
|
|
|
|
| dta_service | 8011 | 8001 |
|
|
|
|
|
| dta_webapp (nginx) | 8081 | 8080 |
|
|
|
|
|
|
|
|
|
|
### Flow
|
|
|
|
|
|
|
|
|
@@ -239,10 +229,9 @@ future beta replica.
|
|
|
|
|
to host `{{ apps_env_dir }}` → git checkout at ref → copy `.env` into checkout →
|
|
|
|
|
`docker compose build` → `up -d` → migrate (run once, shared DB).
|
|
|
|
|
- **node-static**: git checkout at ref → `npm ci` → `npm run build:<env>`
|
|
|
|
|
(writes to the app's `webroot_pattern`, e.g. `/var/www/{env}.app.ditchtheagent/html`
|
|
|
|
|
or `/var/www/{env}.chat.aimloperations/html`).
|
|
|
|
|
- **web-static** role: one nginx container per app host serving the static roots
|
|
|
|
|
on their ports (from `host_apps`); NPM balances across hosts.
|
|
|
|
|
(writes to `/var/www/<env>_dta_webapp`).
|
|
|
|
|
- **web-static** role: one nginx container per app host (adama + roslin) serving
|
|
|
|
|
the static roots on their ports; NPM balances across both.
|
|
|
|
|
|
|
|
|
|
### Reverse proxy / load balancing (NPM at 10.0.0.230)
|
|
|
|
|
|
|
|
|
@@ -254,15 +243,6 @@ point each domain at the backend(s):
|
|
|
|
|
adama+roslin you need the **Advanced** tab with a custom `upstream {}` block
|
|
|
|
|
(or a real LB). Confirm this before relying on active/active.
|
|
|
|
|
|
|
|
|
|
| App | Domains | Backends |
|
|
|
|
|
|-----|---------|----------|
|
|
|
|
|
| company_site | aimloperations.com (+ www) | `adama:8000` + `roslin:8000` |
|
|
|
|
|
| dta_service | (see DTA NPM hosts) | `adama:8001` / `8011` + same on roslin / ai-server-4080 |
|
|
|
|
|
| dta_webapp | (see DTA NPM hosts) | `adama:8080` / `8081` + same on roslin |
|
|
|
|
|
| scha | `schawheaton.aimloperations.com`, `schawheaton.com` (+ www) | `adama:8002` + `roslin:8002` (+ `ai-server-4080:8002`) |
|
|
|
|
|
| chat_web_app | `chat.aimloperations.com` (+ www) | `adama:8082` + `roslin:8082` (+ `ai-server-4080:8082`) |
|
|
|
|
|
| chat_backend | `chatbackend.aimloperations.com` | `adama:8003` + `roslin:8003` + `ai-server-4080:8003` |
|
|
|
|
|
|
|
|
|
|
### Required changes IN each app repo (owned separately)
|
|
|
|
|
|
|
|
|
|
- [ ] `docker-compose.prod.yml`: drop the bundled `db` service; `web` reads
|
|
|
|
@@ -272,11 +252,7 @@ point each domain at the backend(s):
|
|
|
|
|
with a call to `server-infra/scripts/deploy.sh --app <name> --env <env> --ref <sha>`
|
|
|
|
|
(keep the test/docker jobs).
|
|
|
|
|
- [ ] `dta_webapp`: `npm run build:beta` / `build:prod` output to
|
|
|
|
|
`/var/www/beta.app.ditchtheagent/html` / `/var/www/prod.app.ditchtheagent/html`.
|
|
|
|
|
- [ ] `chat_web_app`: `npm run build:beta` / `build:prod` output to
|
|
|
|
|
`/var/www/beta.chat.aimloperations/html` / `/var/www/prod.chat.aimloperations/html`.
|
|
|
|
|
|
|
|
|
|
Companion `chat_web_app` frontend is already registered in this infrastructure repo.
|
|
|
|
|
`/var/www/beta_dta_webapp` / `/var/www/prod_dta_webapp`.
|
|
|
|
|
|
|
|
|
|
### Shared Postgres (10.0.0.230, same box as NPM)
|
|
|
|
|
|
|
|
|
@@ -290,12 +266,8 @@ do not).
|
|
|
|
|
| company_site | beta | `company_site_beta` | `postgres://westfarn:<pw>@10.0.0.230:5432/company_site_beta` |
|
|
|
|
|
| dta_service | prod | `dta_service` | `postgres://westfarn:<pw>@10.0.0.230:5432/dta_service` |
|
|
|
|
|
| dta_service | beta | `dta_service_beta` | `postgres://westfarn:<pw>@10.0.0.230:5432/dta_service_beta` |
|
|
|
|
|
| scha | prod | `scha` | `postgres://westfarn:<pw>@10.0.0.230:5432/scha` |
|
|
|
|
|
| scha | beta | `scha_beta` | `postgres://westfarn:<pw>@10.0.0.230:5432/scha_beta` |
|
|
|
|
|
| chat_backend | prod | `chat_backend` | `postgres://westfarn:<pw>@10.0.0.230:5432/chat_backend` |
|
|
|
|
|
| chat_backend | beta | `chat_backend_beta` | `postgres://westfarn:<pw>@10.0.0.230:5432/chat_backend_beta` |
|
|
|
|
|
|
|
|
|
|
Server prereqs on 10.0.0.230: create each DB + grant `westfarn`;
|
|
|
|
|
Server prereqs on 10.0.0.230: create the 4 DBs + grant `westfarn`;
|
|
|
|
|
`listen_addresses` covers LAN; `pg_hba.conf` allows `10.0.0.0/24`; firewall opens
|
|
|
|
|
5432 to `10.0.0.0/24` only.
|
|
|
|
|
|
|
|
|
@@ -368,9 +340,6 @@ Store vault password for CI in a file readable only by the Act runner (e.g. `~/.
|
|
|
|
|
| 8a | Auto-sync runner checkout on `master` (`.gitea/workflows/sync-checkout.yml`) | Done |
|
|
|
|
|
| 9 | Stub `deploy-apps.yml` + update `company_site` workflow | Future |
|
|
|
|
|
| 10 | Dockerize `company_site` | Future (separate ticket) |
|
|
|
|
|
| 10a | Register + deploy `scha` (all webservers, port 8002) | In progress ([scha#19](https://git.aimloperations.com/ai_ml_operations/scha/issues/19)) |
|
|
|
|
|
| 10b | Register + deploy `chat_web_app` (node-static, port 8082) | In progress ([chat_web_app#13](https://git.aimloperations.com/ai_ml_operations/chat_web_app/issues/13)) |
|
|
|
|
|
| 10c | Register + deploy `chat_backend` (django, port 8003) | In progress ([chat_backend#6](https://git.aimloperations.com/ai_ml_operations/chat_backend/issues/6)) |
|
|
|
|
|
| 11 | Gitea container registry (optional) | Future |
|
|
|
|
|
|
|
|
|
|
## Open Decisions
|
|
|
|
|
westfarn