diff --git a/PROJECTS/beginner/canary-token-generator/backend/internal/config/config.go b/PROJECTS/beginner/canary-token-generator/backend/internal/config/config.go index 162ed398..31c0c237 100644 --- a/PROJECTS/beginner/canary-token-generator/backend/internal/config/config.go +++ b/PROJECTS/beginner/canary-token-generator/backend/internal/config/config.go @@ -14,6 +14,8 @@ import ( "github.com/knadh/koanf/v2" ) +const defaultCanaryBaseURL = "http://localhost:8080" + type Config struct { App AppConfig `koanf:"app"` Server ServerConfig `koanf:"server"` @@ -169,6 +171,11 @@ func Load(configPath string) (*Config, error) { return } + if cfg.Canary.ManageURL == "" || + cfg.Canary.ManageURL == defaultCanaryBaseURL { + cfg.Canary.ManageURL = cfg.Canary.BaseURL + } + if err := validate(cfg); err != nil { loadErr = fmt.Errorf("validate config: %w", err) return @@ -244,8 +251,8 @@ func loadDefaults(k *koanf.Koanf) error { "otel.sample_rate": 0.1, "otel.service_name": "canary-token-generator", - "canary.base_url": "http://localhost:8080", - "canary.manage_url": "http://localhost:8080", + "canary.base_url": defaultCanaryBaseURL, + "canary.manage_url": defaultCanaryBaseURL, "turnstile.secret_key": "", "turnstile.site_key": "", diff --git a/PROJECTS/beginner/canary-token-generator/infra/nginx/dev.nginx b/PROJECTS/beginner/canary-token-generator/infra/nginx/dev.nginx index b4e28a16..45c39dae 100644 --- a/PROJECTS/beginner/canary-token-generator/infra/nginx/dev.nginx +++ b/PROJECTS/beginner/canary-token-generator/infra/nginx/dev.nginx @@ -20,6 +20,36 @@ server { add_header Content-Type text/plain; } + location /api/ { + proxy_pass http://canary; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 30s; + } + + location /c/ { + proxy_pass http://canary; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 30s; + } + + location /k/ { + proxy_pass http://canary; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_read_timeout 30s; + } + location / { proxy_pass http://frontend_dev; proxy_http_version 1.1; diff --git a/PROJECTS/beginner/canary-token-generator/infra/nginx/nginx.conf b/PROJECTS/beginner/canary-token-generator/infra/nginx/nginx.conf index 6b3fc970..5988ea4d 100644 --- a/PROJECTS/beginner/canary-token-generator/infra/nginx/nginx.conf +++ b/PROJECTS/beginner/canary-token-generator/infra/nginx/nginx.conf @@ -29,6 +29,11 @@ http { keepalive 8; } + upstream canary { + server canary:8080; + keepalive 16; + } + limit_req_zone $binary_remote_addr zone=api_limit:10m rate=10r/s; limit_conn_zone $binary_remote_addr zone=conn_limit:10m; limit_req_status 429;