From f6e608cde96a2b274af4f183726c191202300b51 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Fri, 2 Apr 2021 14:59:32 +0200 Subject: [PATCH] change staging for now Signed-off-by: MiniDigger --- .github/workflows/build.yml | 2 +- docker/deployment/docker-compose.yml | 6 +++--- docker/deployment/hangar-backend/application.yml | 8 ++++---- src/main/resources/application.yml | 13 ++++++++----- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b91288f9..f39abe27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: proxyHost: "http://hangar_new_backend:8080" authHost: "http://hangar_new_auth:8000" host: "0.0.0.0" - PUBLIC_HOST: "https://hangar-new.minidigger.me" + PUBLIC_HOST: "https://hangar.benndorf.dev" run: (cd frontend && yarn build) - name: SSH diff --git a/docker/deployment/docker-compose.yml b/docker/deployment/docker-compose.yml index 26d638b4..1e456771 100644 --- a/docker/deployment/docker-compose.yml +++ b/docker/deployment/docker-compose.yml @@ -18,7 +18,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.services.hangar-new.loadbalancer.server.port=3000" - - "traefik.http.routers.hangar-new.rule=Host(`hangar-new.minidigger.me`)" + - "traefik.http.routers.hangar-new.rule=Host(`hangar-new.minidigger.me`) || Host=(`hangar.benndorf.dev`)" - "traefik.http.routers.hangar-new.entrypoints=web-secure" - "traefik.http.routers.hangar-new.tls=true" - "traefik.http.routers.hangar-new.tls.options=default" @@ -65,7 +65,7 @@ services: - "traefik.enable=true" - "traefik.http.services.hangar-new-mail.loadbalancer.server.port=8025" - "traefik.http.routers.hangar-new-mail.middlewares=basicauth@file" - - "traefik.http.routers.hangar-new-mail.rule=Host(`hangar-new-mail.minidigger.me`)" + - "traefik.http.routers.hangar-new-mail.rule=Host(`hangar-new-mail.minidigger.me`) || Host=(`hangar-mail.benndorf.dev`)" - "traefik.http.routers.hangar-new-mail.entrypoints=web-secure" - "traefik.http.routers.hangar-new-mail.tls=true" - "traefik.http.routers.hangar-new-mail.tls.options=default" @@ -81,7 +81,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.services.hangar-new-auth.loadbalancer.server.port=8000" - - "traefik.http.routers.hangar-new-auth.rule=Host(`hangar-new-auth.minidigger.me`)" + - "traefik.http.routers.hangar-new-auth.rule=Host(`hangar-new-auth.minidigger.me`) || Host=(`hangar-auth.benndorf.dev`)" - "traefik.http.routers.hangar-new-auth.entrypoints=web-secure" - "traefik.http.routers.hangar-new-auth.tls=true" - "traefik.http.routers.hangar-new-auth.tls.options=default" diff --git a/docker/deployment/hangar-backend/application.yml b/docker/deployment/hangar-backend/application.yml index 070cc729..cf71ea03 100644 --- a/docker/deployment/hangar-backend/application.yml +++ b/docker/deployment/hangar-backend/application.yml @@ -13,8 +13,8 @@ fake-user: hangar: dev: false - auth-url: "https://hangar-new-auth.minidigger.me" - base-url: "https://hangar-new.minidigger.me" + auth-url: "https://hangar-auth.benndorf.dev" + base-url: "https://hangar.benndorf.dev" plugin-upload-dir: "/hangar/uploads" announcements: @@ -28,8 +28,8 @@ hangar: security: api: - url: "https://hangar-new-auth.minidigger.me" - avatar-url: "https://hangar-new-auth.minidigger.me/avatar/%s?size=120x120" + url: "https://hangar-new.benndorf.dev" + avatar-url: "https://hangar-auth.benndorf.dev/avatar/%s?size=120x120" projects: name-regex: "^[a-zA-Z0-9-_]{3,}$" diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7964fc6b..97a56f87 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -35,11 +35,14 @@ spring: ############# fake-user: enabled: true - id: -2 - name: paper - username: paper - email: paper@papermc.io - +# id: -2 +# name: paper +# username: paper +# email: paper@papermc.io + id: -3 + name: paper2 + username: paper2 + email: paper2@papermc.io hangar: dev: true