fix: Use fediversion.runfoo.run only (no .xyz domain yet)
This commit is contained in:
parent
4782b50f78
commit
42ede48a70
2 changed files with 10 additions and 9 deletions
|
|
@ -4,7 +4,7 @@ on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- testing
|
- testing
|
||||||
- production
|
# - production # Enable when fediversion.xyz domain is ready
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -20,10 +20,11 @@ jobs:
|
||||||
echo "server=nexus-vector" >> $GITHUB_OUTPUT
|
echo "server=nexus-vector" >> $GITHUB_OUTPUT
|
||||||
echo "domain=fediversion.runfoo.run" >> $GITHUB_OUTPUT
|
echo "domain=fediversion.runfoo.run" >> $GITHUB_OUTPUT
|
||||||
echo "deploy_path=/srv/containers/fediversion" >> $GITHUB_OUTPUT
|
echo "deploy_path=/srv/containers/fediversion" >> $GITHUB_OUTPUT
|
||||||
elif [ "${{ github.ref_name }}" = "production" ]; then
|
# Uncomment for production when fediversion.xyz is ready:
|
||||||
echo "server=tangible-aacorn" >> $GITHUB_OUTPUT
|
# elif [ "${{ github.ref_name }}" = "production" ]; then
|
||||||
echo "domain=fediversion.xyz" >> $GITHUB_OUTPUT
|
# echo "server=tangible-aacorn" >> $GITHUB_OUTPUT
|
||||||
echo "deploy_path=/srv/containers/fediversion" >> $GITHUB_OUTPUT
|
# echo "domain=fediversion.xyz" >> $GITHUB_OUTPUT
|
||||||
|
# echo "deploy_path=/srv/containers/fediversion" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Deploy to ${{ steps.target.outputs.server }}
|
- name: Deploy to ${{ steps.target.outputs.server }}
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ services:
|
||||||
- postal-internal
|
- postal-internal
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "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.entrypoints=websecure"
|
||||||
- "traefik.http.routers.fediversion-backend.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.fediversion-backend.tls.certresolver=letsencrypt"
|
||||||
- "traefik.http.routers.fediversion-backend.priority=100"
|
- "traefik.http.routers.fediversion-backend.priority=100"
|
||||||
|
|
@ -53,7 +53,7 @@ services:
|
||||||
- "traefik.http.services.fediversion-backend-svc.loadbalancer.server.port=8000"
|
- "traefik.http.services.fediversion-backend-svc.loadbalancer.server.port=8000"
|
||||||
- "traefik.docker.network=traefik"
|
- "traefik.docker.network=traefik"
|
||||||
# Direct routes for docs (no strip)
|
# 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.entrypoints=websecure"
|
||||||
- "traefik.http.routers.fediversion-backend-docs.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.fediversion-backend-docs.tls.certresolver=letsencrypt"
|
||||||
- "traefik.http.routers.fediversion-backend-docs.priority=100"
|
- "traefik.http.routers.fediversion-backend-docs.priority=100"
|
||||||
|
|
@ -80,7 +80,7 @@ services:
|
||||||
- traefik-public
|
- traefik-public
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "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.entrypoints=websecure"
|
||||||
- "traefik.http.routers.fediversion-frontend.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.fediversion-frontend.tls.certresolver=letsencrypt"
|
||||||
- "traefik.http.routers.fediversion-frontend.priority=50"
|
- "traefik.http.routers.fediversion-frontend.priority=50"
|
||||||
|
|
@ -139,7 +139,7 @@ services:
|
||||||
- traefik-public
|
- traefik-public
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "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.entrypoints=websecure"
|
||||||
- "traefik.http.routers.fediversion-umami.tls.certresolver=letsencrypt"
|
- "traefik.http.routers.fediversion-umami.tls.certresolver=letsencrypt"
|
||||||
- "traefik.http.services.fediversion-umami.loadbalancer.server.port=3000"
|
- "traefik.http.services.fediversion-umami.loadbalancer.server.port=3000"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue