westfarn
95fbae8db4
Sync runner checkout / sync (push) Successful in 6s
## Summary - Closes [#24](#24). - Register `college_craft` in `app_catalog` (`type: django`, repo `ai_ml_operations/college_craft`, default branch `master`). - Add `host_apps` prod `:8006` / beta `:8016` on **adama**, **roslin**, **starbuck**, **apollo**, and **ai-server-4080**. - dj-queue **worker singleton on adama** only (`compose_profiles: [worker]`); other hosts web-only. - Document ports, NPM hosts, Postgres DBs, secrets, Nominatim (`10.0.0.128:8089`), and the app-repo `--app client_site` leftover. - Add `college_craft` to `scripts/deploy.sh` `--app` help. ## Out of scope (ops, after merge) - Create Postgres DBs `college_craft` / `college_craft_beta` on `10.0.0.230` and grant `westfarn`. - Write control-node secrets `~/Documents/secrets/college_craft/college_craft_{prod,beta}.env`. - NPM: `collegecraft.com` (+ www) → `:8006`; `college-craft-preview.aimloperations.com` → `:8016`. - Smoke deploy after secrets + DBs exist: ```bash ~/Documents/repos/server-infra/scripts/deploy.sh --app college_craft --env beta --ref master ~/Documents/repos/server-infra/scripts/deploy.sh --app college_craft --env prod --ref master ``` ## Test plan - [ ] Confirm `app_catalog.college_craft` matches other django apps (`compose_file`, `migrate_cmd`). - [ ] Confirm ports 8006/8016 unused elsewhere and match across all five hosts. - [ ] Confirm only adama has `compose_profiles: [worker]` for college_craft. - [ ] After secrets + DBs: deploy beta then prod; `/healthz/` up on both; prod holding page, beta full site. Reviewed-on: #25
136 lines
5.4 KiB
YAML
136 lines
5.4 KiB
YAML
---
|
|
ansible_user: westfarn
|
|
ansible_ssh_private_key_file: /home/westfarn/.ssh/ansible_deploy
|
|
ansible_python_interpreter: /usr/bin/python3
|
|
|
|
admin_user: westfarn
|
|
|
|
# UFW
|
|
ufw_ssh_port: 22
|
|
ufw_ssh_allowed_network: 10.0.0.0/24
|
|
ufw_allowed_tcp_ports:
|
|
- 80
|
|
- 443
|
|
|
|
# Docker
|
|
docker_users:
|
|
- "{{ admin_user }}"
|
|
|
|
# Tianji monitoring
|
|
tianji_server_url: https://tianji.aimloperations.com
|
|
tianji_workspace_id: cm7w8087y020lddswyhamadj2
|
|
tianji_install_script_url: "https://tianji.aimloperations.com/serverStatus/{{ tianji_workspace_id }}/install.sh?url={{ tianji_server_url }}"
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Observability (Alloy on every host → Loki/Prometheus/Grafana on control node)
|
|
# See docs/OBSERVABILITY.md
|
|
# ---------------------------------------------------------------------------
|
|
loki_url: "http://10.0.0.128:3100"
|
|
loki_push_url: "{{ loki_url }}/loki/api/v1/push"
|
|
prometheus_url: "http://10.0.0.128:9090"
|
|
prometheus_remote_write_url: "{{ prometheus_url }}/api/v1/write"
|
|
grafana_public_url: "https://grafana.aimloperations.com"
|
|
grafana_public_domain: "grafana.aimloperations.com"
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# App deployment (Phase 2)
|
|
# ---------------------------------------------------------------------------
|
|
git_base_url: "ssh://git@git.aimloperations.com:30009"
|
|
|
|
# Where app checkouts and per-app env files live on each target host.
|
|
apps_base_dir: /opt/apps
|
|
apps_env_dir: "{{ apps_base_dir }}/env" # persistent .env files, never in git
|
|
apps_src_dir: "{{ apps_base_dir }}/src" # git checkouts
|
|
|
|
# Control-node directory holding per-app .env secrets, pushed to hosts at
|
|
# deploy time. Layout: <secrets_dir>/<app>/<app>_<env>.env (never in git).
|
|
secrets_dir: "{{ lookup('ansible.builtin.env', 'HOME') }}/Documents/secrets"
|
|
|
|
# Static site document root base (dta_webapp writes build output here).
|
|
web_static_root: /var/www
|
|
|
|
# Catalog of deployable apps. host_apps (per host_vars) references these by name.
|
|
app_catalog:
|
|
company_site:
|
|
type: django
|
|
repo: "{{ git_base_url }}/ai_ml_operations/company_site.git"
|
|
default_branch: master
|
|
compose_file: docker-compose.prod.yml
|
|
web_service: web
|
|
migrate_cmd: "uv run python manage.py migrate --noinput"
|
|
dta_service:
|
|
type: django
|
|
repo: "{{ git_base_url }}/Ditch_The_Agent/dta_service.git"
|
|
default_branch: main
|
|
compose_file: docker-compose.prod.yml
|
|
web_service: web
|
|
migrate_cmd: "uv run python manage.py migrate --noinput"
|
|
# Pre-docker deploy used venv + systemd on each host; stop before compose up.
|
|
legacy_systemd_units:
|
|
beta: beta_dta_wsgi
|
|
prod: prod_dta_wsgi
|
|
dta_webapp:
|
|
type: node-static
|
|
repo: "{{ git_base_url }}/Ditch_The_Agent/dta_webapp.git"
|
|
default_branch: main
|
|
# package.json lives in this subdir of the checkout (npm runs here).
|
|
subdir: ditch-the-agent
|
|
# Document root served by nginx and written by `npm run build:<env>`.
|
|
# {env} is replaced with the entry's env (beta/prod).
|
|
webroot_pattern: "/var/www/{env}.realpath.app/html"
|
|
# deploy runs `npm ci` then `npm run build:<env>`; that script writes to
|
|
# {{ web_static_root }}/<env>_dta_webapp (beta/prod), served by web-static.
|
|
scha:
|
|
type: django
|
|
repo: "{{ git_base_url }}/ai_ml_operations/scha.git"
|
|
default_branch: master
|
|
compose_file: docker-compose.prod.yml
|
|
web_service: web
|
|
migrate_cmd: "uv run python manage.py migrate --noinput"
|
|
chat_web_app:
|
|
type: node-static
|
|
repo: "{{ git_base_url }}/ai_ml_operations/chat_web_app.git"
|
|
default_branch: master
|
|
# package.json lives in this subdir of the checkout (npm runs here).
|
|
subdir: llm-fe
|
|
# Document root served by nginx and written by `npm run build:<env>`.
|
|
# {env} is replaced with the entry's env (beta/prod).
|
|
webroot_pattern: "/var/www/{env}.chat.aimloperations/html"
|
|
chat_backend:
|
|
type: django
|
|
repo: "{{ git_base_url }}/ai_ml_operations/chat_backend.git"
|
|
default_branch: master
|
|
compose_file: docker-compose.prod.yml
|
|
web_service: web
|
|
migrate_cmd: "uv run python manage.py migrate --noinput"
|
|
monica_site:
|
|
type: django
|
|
repo: "{{ git_base_url }}/ai_ml_operations/monica_site.git"
|
|
default_branch: main
|
|
compose_file: docker-compose.prod.yml
|
|
web_service: web
|
|
migrate_cmd: "uv run python manage.py migrate --noinput"
|
|
# dj-queue worker = compose profile `worker` (singleton). Deploy starts it
|
|
# via host_apps.compose_profiles on adama only (see host_vars/adama.yml).
|
|
url_shortening_service:
|
|
type: django
|
|
repo: "{{ git_base_url }}/ai_ml_operations/url_shortening_service.git"
|
|
default_branch: master
|
|
compose_file: docker-compose.prod.yml
|
|
web_service: web
|
|
migrate_cmd: "uv run python manage.py migrate --noinput"
|
|
# No compose worker profile. Two public NPM hosts share one container/port.
|
|
college_craft:
|
|
type: django
|
|
repo: "{{ git_base_url }}/ai_ml_operations/college_craft.git"
|
|
default_branch: master
|
|
compose_file: docker-compose.prod.yml
|
|
web_service: web
|
|
migrate_cmd: "uv run python manage.py migrate --noinput"
|
|
# dj-queue worker = compose profile `worker` (singleton). Deploy starts it
|
|
# via host_apps.compose_profiles on adama only (see host_vars/adama.yml).
|
|
|
|
# Deploy filter vars. CI passes these; manual runs may leave them undefined
|
|
# to (re)deploy every app listed in the host's host_apps.
|
|
# app: <name> app_env: beta|prod app_ref: <git sha or branch, default master>
|