From 42ede48a7058ab5f0734bcf78caaf31601bbefd5 Mon Sep 17 00:00:00 2001 From: fullsizemalt <106900403+fullsizemalt@users.noreply.github.com> Date: Sun, 28 Dec 2025 14:46:41 -0800 Subject: [PATCH] fix: Use fediversion.runfoo.run only (no .xyz domain yet) --- .forgejo/workflows/deploy.yml | 11 ++++++----- docker-compose.yml | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 9cc38bb..efdaa4e 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -4,7 +4,7 @@ on: push: branches: - testing - - production + # - production # Enable when fediversion.xyz domain is ready jobs: deploy: @@ -20,10 +20,11 @@ jobs: echo "server=nexus-vector" >> $GITHUB_OUTPUT echo "domain=fediversion.runfoo.run" >> $GITHUB_OUTPUT echo "deploy_path=/srv/containers/fediversion" >> $GITHUB_OUTPUT - elif [ "${{ github.ref_name }}" = "production" ]; then - echo "server=tangible-aacorn" >> $GITHUB_OUTPUT - echo "domain=fediversion.xyz" >> $GITHUB_OUTPUT - echo "deploy_path=/srv/containers/fediversion" >> $GITHUB_OUTPUT + # Uncomment for production when fediversion.xyz is ready: + # elif [ "${{ github.ref_name }}" = "production" ]; then + # echo "server=tangible-aacorn" >> $GITHUB_OUTPUT + # echo "domain=fediversion.xyz" >> $GITHUB_OUTPUT + # echo "deploy_path=/srv/containers/fediversion" >> $GITHUB_OUTPUT fi - name: Deploy to ${{ steps.target.outputs.server }} diff --git a/docker-compose.yml b/docker-compose.yml index 46c21ef..22a58a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,7 +43,7 @@ services: - postal-internal labels: - "traefik.enable=true" - - "traefik.http.routers.fediversion-backend.rule=(Host(`fediversion.runfoo.run`) || Host(`fediversion.xyz`)) && PathPrefix(`/api`)" + - "traefik.http.routers.fediversion-backend.rule=Host(`fediversion.runfoo.run`) && PathPrefix(`/api`)" - "traefik.http.routers.fediversion-backend.entrypoints=websecure" - "traefik.http.routers.fediversion-backend.tls.certresolver=letsencrypt" - "traefik.http.routers.fediversion-backend.priority=100" @@ -53,7 +53,7 @@ services: - "traefik.http.services.fediversion-backend-svc.loadbalancer.server.port=8000" - "traefik.docker.network=traefik" # Direct routes for docs (no strip) - - "traefik.http.routers.fediversion-backend-docs.rule=(Host(`fediversion.runfoo.run`) || Host(`fediversion.xyz`)) && PathPrefix(`/docs`, `/openapi.json`)" + - "traefik.http.routers.fediversion-backend-docs.rule=Host(`fediversion.runfoo.run`) && PathPrefix(`/docs`, `/openapi.json`)" - "traefik.http.routers.fediversion-backend-docs.entrypoints=websecure" - "traefik.http.routers.fediversion-backend-docs.tls.certresolver=letsencrypt" - "traefik.http.routers.fediversion-backend-docs.priority=100" @@ -80,7 +80,7 @@ services: - traefik-public labels: - "traefik.enable=true" - - "traefik.http.routers.fediversion-frontend.rule=(Host(`fediversion.runfoo.run`) || Host(`fediversion.xyz`)) && !PathPrefix(`/api`, `/docs`, `/openapi.json`)" + - "traefik.http.routers.fediversion-frontend.rule=Host(`fediversion.runfoo.run`) && !PathPrefix(`/api`, `/docs`, `/openapi.json`)" - "traefik.http.routers.fediversion-frontend.entrypoints=websecure" - "traefik.http.routers.fediversion-frontend.tls.certresolver=letsencrypt" - "traefik.http.routers.fediversion-frontend.priority=50" @@ -139,7 +139,7 @@ services: - traefik-public labels: - "traefik.enable=true" - - "traefik.http.routers.fediversion-umami.rule=Host(`stats.fediversion.xyz`) || Host(`stats.fediversion.runfoo.run`)" + - "traefik.http.routers.fediversion-umami.rule=Host(`stats.fediversion.runfoo.run`)" - "traefik.http.routers.fediversion-umami.entrypoints=websecure" - "traefik.http.routers.fediversion-umami.tls.certresolver=letsencrypt" - "traefik.http.services.fediversion-umami.loadbalancer.server.port=3000"