badbl0cks
6aa15d1af9
- **Implemented Dynamic Gatekeeper (Anubis) Proxy:** - Introduced Anubis as a Gatekeeper proxy layer for services (`web`, `web-staging`, `feedback`, `health`). - Added `docker-gen` setup (`docker-compose_gatekeeper.template.yml`, `gatekeeper-manager`) to dynamically configure Anubis instances based on container labels (`enable_gatekeeper=true`). - Updated HAProxy to route traffic through the respective Gatekeeper services. - **Enhanced Service Health Monitoring & Checks:** - Integrated `django-health-check` into the Django application, providing detailed health endpoints (e.g., `/health/`). - Replaced the custom health check view with `django-health-check` URLs. - Added `psutil` for system metrics in health checks. - Made Gatus configuration dynamic using `docker-gen` (`config.template.yaml`), allowing automatic discovery and monitoring of service instances (e.g., web workers). - Externalized Gatus SMTP credentials to environment variables. - Strengthened `docker-compose_core.yml` with a combined `db-redis-healthcheck` service reporting to Gatus. - Added explicit health checks for `db` and `redis` services in `docker-compose.yml`. - **Improved Docker & Compose Configuration:** - Added `depends_on` conditions in `docker-compose.yml` for `web` and `celery` services to wait for the database. - Updated `ALLOWED_HOSTS` in `docker-compose_staging.yml` and `docker-compose_web.yml` to include internal container names for Gatekeeper communication. - Set `DEBUG=False` for staging services. - Removed `.env.production` from `.gitignore` (standardized to `.env`). - Streamlined `scripts/entrypoint.sh` by removing the call to the no-longer-present `/deploy.sh`. - **Dependency Updates:** - Added `django-health-check>=3.18.3` and `psutil>=7.0.0` to `pyproject.toml` and `uv.lock`. - Updated `settings.py` to include `health_check` apps, configuration, and use `REDIS_URL` consistently. - **Streamlined deployment script used in GHA:** - Updated the workflow to copy new server files and create a new `.env` file in the temporary directory before moving them into place. - Consolidated the stopping and removal of old containers into a single step for better clarity and efficiency. - Reduce container downtime by rearranging stop/start steps.
50 lines
1.5 KiB
INI
50 lines
1.5 KiB
INI
# https://docs.haproxy.org/3.1/configuration.html
|
|
global
|
|
log stdout format raw local0 # Send logs to Docker's stdout
|
|
master-worker
|
|
|
|
resolvers docker_resolver
|
|
nameserver docker_dns 127.0.0.11:53 # Docker's internal DNS
|
|
resolve_retries 3
|
|
timeout resolve 1s
|
|
timeout retry 1s
|
|
hold valid 10s
|
|
hold obsolete 30s
|
|
accepted_payload_size 8192 # Optional: Increase if you have many replicas
|
|
|
|
defaults
|
|
mode http
|
|
log global
|
|
timeout client 120s
|
|
timeout connect 120s
|
|
timeout server 120s
|
|
timeout http-request 120s
|
|
option httplog
|
|
|
|
frontend haproxy_entrypoint
|
|
bind :443 ssl crt /certs/crt.pem verify required ca-file /certs/ca.pem
|
|
use_backend %[req.hdr(host),lower,word(1,:)] # strip out port from host
|
|
|
|
frontend checks
|
|
bind :80
|
|
default_backend basic_check
|
|
|
|
backend basic_check
|
|
http-request return status 200 content-type "text/plain" lf-string "OK/HEALTHY"
|
|
|
|
backend pkmntrade.club
|
|
balance leastconn
|
|
server-template gatekeeper-web- 4 gatekeeper-web:8000 check resolvers docker_resolver init-addr libc,none
|
|
|
|
backend staging.pkmntrade.club
|
|
balance leastconn
|
|
server-template gatekeeper-web-staging- 4 gatekeeper-web-staging:8000 check resolvers docker_resolver init-addr libc,none
|
|
|
|
backend feedback.pkmntrade.club
|
|
server-template gatekeeper-feedback- 4 gatekeeper-feedback:8000 check resolvers docker_resolver init-addr libc,none
|
|
|
|
backend health.pkmntrade.club
|
|
server-template gatekeeper-health- 4 gatekeeper-health:8000 check resolvers docker_resolver init-addr libc,none
|
|
|
|
#EOF - trailing newline required
|
|
|