Merge branch 'main' into development

# Conflicts: # operations/deploy-live.hcl
anyone-protocol · Sep 2, 2024 · 20f5522 · 20f5522
2 parents 3864056 + 4241c7d
commit 20f5522
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -5,9 +5,9 @@ Not all metrics are available, only specific ones.
 
 There are 3 different instances of the service running for each environment:
 
-- https://api-dev.dmz.ator.dev
-- https://api-stage.dmz.ator.dev
-- https://api-live.dmz.ator.dev
+- https://api-dev.ec.anyone.tech
+- https://api-stage.ec.anyone.tech
+- https://api.ec.anyone.tech
 
 For now there are only three metrics endpoints on each environment available:
 

diff --git a/operations/deploy-dev.hcl b/operations/deploy-dev.hcl
@@ -99,6 +99,15 @@ job "api-service-dev" {
           "traefik.http.routers.api-dev.middlewares=api-dev-ratelimit",
           "traefik.http.middlewares.api-dev-ratelimit.ratelimit.average=300",
           "traefik.http.middlewares.api-dev-ratelimit.ratelimit.period=1m",
+
+          "traefik-ec.enable=true",
+          "traefik-ec.http.routers.api-dev.rule=Host(`api-dev.ec.anyone.tech`)",
+          "traefik-ec.http.routers.api-dev.entrypoints=https",
+          "traefik-ec.http.routers.api-dev.tls=true",
+          "traefik-ec.http.routers.api-dev.tls.certresolver=anyoneresolver",
+          "traefik-ec.http.routers.api-dev.middlewares=api-dev-ratelimit",
+          "traefik-ec.http.middlewares.api-dev-ratelimit.ratelimit.average=30",
+          "traefik-ec.http.middlewares.api-dev-ratelimit.ratelimit.period=1m",
         ]
         check {
           name = "Api service check"

diff --git a/operations/deploy-live.hcl b/operations/deploy-live.hcl
@@ -98,6 +98,15 @@ job "api-service-live" {
           "traefik.http.routers.api-live.tls.certresolver=atorresolver",
           "traefik.http.routers.api-live.middlewares=api-live-ratelimit",
           "traefik.http.middlewares.api-live-ratelimit.ratelimit.average=1000"
+
+          "traefik-ec.enable=true",
+          "traefik-ec.http.routers.api-live.rule=Host(`api.ec.anyone.tech`)",
+          "traefik-ec.http.routers.api-live.entrypoints=https",
+          "traefik-ec.http.routers.api-live.tls=true",
+          "traefik-ec.http.routers.api-live.tls.certresolver=anyoneresolver",
+          "traefik-ec.http.routers.api-live.middlewares=api-live-ratelimit",
+          "traefik-ec.http.middlewares.api-live-ratelimit.ratelimit.average=300",
+          "traefik-ec.http.middlewares.api-live-ratelimit.ratelimit.period=1m",
         ]
         check {
           name = "Api service check"

diff --git a/operations/deploy-stage.hcl b/operations/deploy-stage.hcl
@@ -99,6 +99,15 @@ job "api-service-stage" {
           "traefik.http.routers.api-stage.middlewares=api-stage-ratelimit",
           "traefik.http.middlewares.api-stage-ratelimit.ratelimit.average=3000",
           "traefik.http.middlewares.api-stage-ratelimit.ratelimit.period=1m",
+
+          "traefik-ec.enable=true",
+          "traefik-ec.http.routers.api-stage.rule=Host(`api-stage.ec.anyone.tech`)",
+          "traefik-ec.http.routers.api-stage.entrypoints=https",
+          "traefik-ec.http.routers.api-stage.tls=true",
+          "traefik-ec.http.routers.api-stage.tls.certresolver=anyoneresolver",
+          "traefik-ec.http.routers.api-stage.middlewares=api-stage-ratelimit",
+          "traefik-ec.http.middlewares.api-stage-ratelimit.ratelimit.average=300",
+          "traefik-ec.http.middlewares.api-stage-ratelimit.ratelimit.period=1m",
         ]
         check {
           name = "Api service check"