From 34f09025ab29e971414c88712fac62ab61d1c53a Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 17:41:47 +0200 Subject: [PATCH 01/34] feat(traefik)!: use localhost --- src/production/production.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/production/production.yml b/src/production/production.yml index a6239a33..965ac0fe 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -140,6 +140,9 @@ services: environment: CF_DNS_API_TOKEN_FILE: /run/secrets/traefik_cf-dns-api-token CF_ZONE_API_TOKEN_FILE: /run/secrets/traefik_cf-zone-api-token + ports: + - host_ip: 127.0.0.1 + - host_ip: 127.0.0.1 secrets: - traefik_cf-dns-api-token - traefik_cf-zone-api-token From 5479f8c743907540f577af53c707fb24a5f6b13a Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 23 May 2024 15:43:25 +0000 Subject: [PATCH 02/34] chore(release): 6.0.0-beta.1 [skip ci] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## [6.0.0-beta.1](https://github.com/maevsi/maevsi_stack/compare/5.2.3...6.0.0-beta.1) (2024-05-23) ### ⚠ BREAKING CHANGES * **traefik:** use localhost ### Features * **traefik:** use localhost ([34f0902](https://github.com/maevsi/maevsi_stack/commit/34f09025ab29e971414c88712fac62ab61d1c53a)) ### Bug Fixes * **deps:** update ghcr.io/maevsi/maevsi to v4.9.0 ([5d12b12](https://github.com/maevsi/maevsi_stack/commit/5d12b12f23fbee322b006b6d89100f9add33cab5)) --- CHANGELOG.md | 16 ++++++++++++++++ package.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66f6712e..6c43e878 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## [6.0.0-beta.1](https://github.com/maevsi/maevsi_stack/compare/5.2.3...6.0.0-beta.1) (2024-05-23) + + +### ⚠ BREAKING CHANGES + +* **traefik:** use localhost + +### Features + +* **traefik:** use localhost ([34f0902](https://github.com/maevsi/maevsi_stack/commit/34f09025ab29e971414c88712fac62ab61d1c53a)) + + +### Bug Fixes + +* **deps:** update ghcr.io/maevsi/maevsi to v4.9.0 ([5d12b12](https://github.com/maevsi/maevsi_stack/commit/5d12b12f23fbee322b006b6d89100f9add33cab5)) + ## [5.2.3](https://github.com/maevsi/maevsi_stack/compare/5.2.2...5.2.3) (2024-05-13) diff --git a/package.json b/package.json index 223eda92..fa17e7eb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "5.2.3", + "version": "6.0.0-beta.1", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From 71a2c012f28420c3f9cea63d3a95b4654fa74210 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 17:54:40 +0200 Subject: [PATCH 03/34] fix: revert "feat(traefik)!: use localhost" This reverts commit 34f09025ab29e971414c88712fac62ab61d1c53a. --- src/production/production.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/production/production.yml b/src/production/production.yml index 965ac0fe..a6239a33 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -140,9 +140,6 @@ services: environment: CF_DNS_API_TOKEN_FILE: /run/secrets/traefik_cf-dns-api-token CF_ZONE_API_TOKEN_FILE: /run/secrets/traefik_cf-zone-api-token - ports: - - host_ip: 127.0.0.1 - - host_ip: 127.0.0.1 secrets: - traefik_cf-dns-api-token - traefik_cf-zone-api-token From 60cb03deba0dc7ac9123435623a2c176a5f4a6c5 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 18:11:27 +0200 Subject: [PATCH 04/34] fix(ci): update dargmuesli/github-actions to v2.1.1-beta.1 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release-schedule.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc014014..83279072 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,12 +25,12 @@ jobs: build: needs: prepare_jobs name: dargstack rgen - uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.0.0-beta.13 + uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.1.1-beta.1 if: needs.prepare_jobs.outputs.pr_found == 'false' || github.event_name == 'pull_request' release-semantic: needs: build name: Semantic Release - uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.0.0-beta.13 + uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.1.1-beta.1 permissions: contents: write secrets: diff --git a/.github/workflows/release-schedule.yml b/.github/workflows/release-schedule.yml index 65519d1e..c4776517 100644 --- a/.github/workflows/release-schedule.yml +++ b/.github/workflows/release-schedule.yml @@ -8,7 +8,7 @@ on: jobs: release-schedule: name: "Release: Scheduled" - uses: dargmuesli/github-actions/.github/workflows/release-schedule.yml@2.0.0-beta.13 + uses: dargmuesli/github-actions/.github/workflows/release-schedule.yml@2.1.1-beta.1 secrets: PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} with: From c2bb90488be774e923fa395f83b4a334935cd7fe Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 18:41:48 +0200 Subject: [PATCH 05/34] ci: specify pull request types instead of late checking --- .github/workflows/ci.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83279072..995cee84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,6 +2,9 @@ name: CI on: pull_request: + types: + - opened + - reopened push: branches: - alpha @@ -10,23 +13,9 @@ on: - renovate/** jobs: - prepare_jobs: - name: "Prepare: job optimization" - runs-on: ubuntu-latest - outputs: - pr_found: ${{ steps.pr.outputs.pr_found }} - steps: - - name: Get current PR - id: pr - uses: 8BitJonny/gh-get-current-pr@3.0.0 - with: - filterOutClosed: true - sha: ${{ github.event.pull_request.head.sha }} build: - needs: prepare_jobs name: dargstack rgen uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.1.1-beta.1 - if: needs.prepare_jobs.outputs.pr_found == 'false' || github.event_name == 'pull_request' release-semantic: needs: build name: Semantic Release From d632e1ce88fa78db5c6a0af2e794a85448d84012 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 23 May 2024 16:43:03 +0000 Subject: [PATCH 06/34] chore(release): 6.0.0-beta.2 [skip ci] ## [6.0.0-beta.2](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.1...6.0.0-beta.2) (2024-05-23) ### Bug Fixes * **ci:** update dargmuesli/github-actions to v2.1.1-beta.1 ([60cb03d](https://github.com/maevsi/maevsi_stack/commit/60cb03deba0dc7ac9123435623a2c176a5f4a6c5)) * **jobber:** deactivate virtual environment when done ([79e1de3](https://github.com/maevsi/maevsi_stack/commit/79e1de379c6eaab345af2e0c57c65213d08d1e88)) * revert "feat(traefik)!: use localhost" ([71a2c01](https://github.com/maevsi/maevsi_stack/commit/71a2c012f28420c3f9cea63d3a95b4654fa74210)) --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9696fc20..01805f95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [6.0.0-beta.2](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.1...6.0.0-beta.2) (2024-05-23) + + +### Bug Fixes + +* **ci:** update dargmuesli/github-actions to v2.1.1-beta.1 ([60cb03d](https://github.com/maevsi/maevsi_stack/commit/60cb03deba0dc7ac9123435623a2c176a5f4a6c5)) +* **jobber:** deactivate virtual environment when done ([79e1de3](https://github.com/maevsi/maevsi_stack/commit/79e1de379c6eaab345af2e0c57c65213d08d1e88)) +* revert "feat(traefik)!: use localhost" ([71a2c01](https://github.com/maevsi/maevsi_stack/commit/71a2c012f28420c3f9cea63d3a95b4654fa74210)) + ## [6.0.0-beta.1](https://github.com/maevsi/maevsi_stack/compare/5.2.3...6.0.0-beta.1) (2024-05-23) diff --git a/package.json b/package.json index eca74930..f956c0a5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.1", + "version": "6.0.0-beta.2", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From 8dea724f65180dcec9e0a03895cc729d178430a0 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 18:53:57 +0200 Subject: [PATCH 07/34] fix(ci): test pull request From d0013886ae23a9d1106ac7eae09f8ba2f2b6cff9 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 18:54:42 +0200 Subject: [PATCH 08/34] fix(ci): test pull request From 7b47d0ec8eee416a3c30d75703ae989ebbdc108b Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 18:56:56 +0200 Subject: [PATCH 09/34] fix: revert "ci: specify pull request types instead of late checking" This reverts commit c2bb90488be774e923fa395f83b4a334935cd7fe. --- .github/workflows/ci.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 995cee84..83279072 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,6 @@ name: CI on: pull_request: - types: - - opened - - reopened push: branches: - alpha @@ -13,9 +10,23 @@ on: - renovate/** jobs: + prepare_jobs: + name: "Prepare: job optimization" + runs-on: ubuntu-latest + outputs: + pr_found: ${{ steps.pr.outputs.pr_found }} + steps: + - name: Get current PR + id: pr + uses: 8BitJonny/gh-get-current-pr@3.0.0 + with: + filterOutClosed: true + sha: ${{ github.event.pull_request.head.sha }} build: + needs: prepare_jobs name: dargstack rgen uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.1.1-beta.1 + if: needs.prepare_jobs.outputs.pr_found == 'false' || github.event_name == 'pull_request' release-semantic: needs: build name: Semantic Release From b41886650a288413c4404bd1863a8f8e1184d45a Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 23 May 2024 19:21:22 +0200 Subject: [PATCH 10/34] ci: skip build --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83279072..c27ad7c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,12 +25,13 @@ jobs: build: needs: prepare_jobs name: dargstack rgen - uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.1.1-beta.1 - if: needs.prepare_jobs.outputs.pr_found == 'false' || github.event_name == 'pull_request' + uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.2.0-beta.2 + with: + SKIP: ${{ needs.prepare_jobs.outputs.pr_found == 'true' && github.event_name != 'pull_request' }} release-semantic: needs: build name: Semantic Release - uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.1.1-beta.1 + uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.2.0-beta.2 permissions: contents: write secrets: From 2f6e476c1c011a25c17478868007cbe77f123bd0 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Mon, 27 May 2024 01:43:59 +0200 Subject: [PATCH 11/34] chore(deps): update dargmuesli/github-actions to v2.2.0-beta.3 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c27ad7c6..0a962689 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,13 @@ jobs: build: needs: prepare_jobs name: dargstack rgen - uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.2.0-beta.2 + uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.2.0-beta.3 with: SKIP: ${{ needs.prepare_jobs.outputs.pr_found == 'true' && github.event_name != 'pull_request' }} release-semantic: needs: build name: Semantic Release - uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.2.0-beta.2 + uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.2.0-beta.3 permissions: contents: write secrets: From 9257508cd41ad38884251180bbb314ca6994fd68 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Mon, 27 May 2024 02:01:54 +0200 Subject: [PATCH 12/34] chore(deps): update dargmuesli/github-actions to v2.2.0-beta.4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a962689..a0439bba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,13 @@ jobs: build: needs: prepare_jobs name: dargstack rgen - uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.2.0-beta.3 + uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.2.0-beta.4 with: SKIP: ${{ needs.prepare_jobs.outputs.pr_found == 'true' && github.event_name != 'pull_request' }} release-semantic: needs: build name: Semantic Release - uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.2.0-beta.3 + uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.2.0-beta.4 permissions: contents: write secrets: From 102c2b0b6aa68b9ea6dee42de387592776347312 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Mon, 27 May 2024 02:04:44 +0200 Subject: [PATCH 13/34] fix(ci): test pull request From 80f95da03b857ec95e87e8dc2caa3339e7464b10 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Mon, 27 May 2024 02:17:19 +0200 Subject: [PATCH 14/34] chore(deps): update dargmuesli/github-actions to v2.2.0-beta.5 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a0439bba..cb054857 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,13 +25,13 @@ jobs: build: needs: prepare_jobs name: dargstack rgen - uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.2.0-beta.4 + uses: dargmuesli/github-actions/.github/workflows/dargstack-rgen.yml@2.2.0-beta.5 with: SKIP: ${{ needs.prepare_jobs.outputs.pr_found == 'true' && github.event_name != 'pull_request' }} release-semantic: needs: build name: Semantic Release - uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.2.0-beta.4 + uses: dargmuesli/github-actions/.github/workflows/release-semantic.yml@2.2.0-beta.5 permissions: contents: write secrets: From e402b29e19490e3af6b17abcd21bf6ca9c760d03 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 27 May 2024 00:18:17 +0000 Subject: [PATCH 15/34] chore(release): 6.0.0-beta.3 [skip ci] ## [6.0.0-beta.3](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.2...6.0.0-beta.3) (2024-05-27) ### Bug Fixes * **ci:** test pull request ([102c2b0](https://github.com/maevsi/maevsi_stack/commit/102c2b0b6aa68b9ea6dee42de387592776347312)) * **ci:** test pull request ([d001388](https://github.com/maevsi/maevsi_stack/commit/d0013886ae23a9d1106ac7eae09f8ba2f2b6cff9)) * **ci:** test pull request ([8dea724](https://github.com/maevsi/maevsi_stack/commit/8dea724f65180dcec9e0a03895cc729d178430a0)) * revert "ci: specify pull request types instead of late checking" ([7b47d0e](https://github.com/maevsi/maevsi_stack/commit/7b47d0ec8eee416a3c30d75703ae989ebbdc108b)) --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01805f95..d488ecbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [6.0.0-beta.3](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.2...6.0.0-beta.3) (2024-05-27) + + +### Bug Fixes + +* **ci:** test pull request ([102c2b0](https://github.com/maevsi/maevsi_stack/commit/102c2b0b6aa68b9ea6dee42de387592776347312)) +* **ci:** test pull request ([d001388](https://github.com/maevsi/maevsi_stack/commit/d0013886ae23a9d1106ac7eae09f8ba2f2b6cff9)) +* **ci:** test pull request ([8dea724](https://github.com/maevsi/maevsi_stack/commit/8dea724f65180dcec9e0a03895cc729d178430a0)) +* revert "ci: specify pull request types instead of late checking" ([7b47d0e](https://github.com/maevsi/maevsi_stack/commit/7b47d0ec8eee416a3c30d75703ae989ebbdc108b)) + ## [6.0.0-beta.2](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.1...6.0.0-beta.2) (2024-05-23) diff --git a/package.json b/package.json index f956c0a5..93c24153 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.2", + "version": "6.0.0-beta.3", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From 353dade03ccb22ac5ee281e60c852ee3213d79d6 Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Tue, 4 Jun 2024 22:43:08 +0200 Subject: [PATCH 16/34] feat(infra): remove redirect and use port 80 for incoming connections --- src/development/stack.yml | 21 ++------------------- src/production/production.yml | 1 - 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/src/development/stack.yml b/src/development/stack.yml index 83aa3f2d..77c48f06 100644 --- a/src/development/stack.yml +++ b/src/development/stack.yml @@ -99,7 +99,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.routers.adminer.middlewares=redirectscheme - traefik.http.routers.adminer.rule=Host(`adminer.${STACK_DOMAIN}`) - traefik.http.routers.adminer_secure.rule=Host(`adminer.${STACK_DOMAIN}`) - traefik.http.routers.adminer_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -112,7 +111,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.routers.grafana.middlewares=redirectscheme - traefik.http.routers.grafana.rule=Host(`grafana.${STACK_DOMAIN}`) - traefik.http.routers.grafana_secure.rule=Host(`grafana.${STACK_DOMAIN}`) - traefik.http.routers.grafana_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -152,11 +150,10 @@ services: - traefik.http.middlewares.maevsi_redirectregex.redirectregex.regex=^https?:\/\/www\.${STACK_DOMAIN}\/(.*) - traefik.http.middlewares.maevsi_redirectregex.redirectregex.replacement=https://${STACK_DOMAIN}/$${2} - traefik.http.routers.maevsi.entryPoints=web - - traefik.http.routers.maevsi.middlewares=redirectscheme,maevsi_redirectregex - traefik.http.routers.maevsi.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`) - traefik.http.routers.maevsi.service=maevsi #DARGSTACK-REMOVE - traefik.http.routers.maevsi_secure.entryPoints=web-secure - - traefik.http.routers.maevsi_secure.middlewares=maevsi_redirectregex,maevsi_cors + - traefik.http.routers.maevsi_secure.middlewares=maevsi_cors - traefik.http.routers.maevsi_secure.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`) - traefik.http.routers.maevsi_secure.tls.options=mintls13@file #DARGSTACK-REMOVE - traefik.http.routers.maevsi_secure.service=maevsi #DARGSTACK-REMOVE @@ -196,7 +193,6 @@ services: labels: - traefik.enable=true # Minio Console - - traefik.http.routers.minio.middlewares=redirectscheme - traefik.http.routers.minio.rule=Host(`minio.${STACK_DOMAIN}`) - traefik.http.routers.minio.service=minio - traefik.http.routers.minio_secure.rule=Host(`minio.${STACK_DOMAIN}`) @@ -205,7 +201,6 @@ services: - traefik.http.services.minio.loadbalancer.server.port=9001 - traefik.http.services.minio.loadbalancer.passhostheader=true # Minio itself - - traefik.http.routers.s3.middlewares=redirectscheme - traefik.http.routers.s3.rule=Host(`s3.${STACK_DOMAIN}`) - traefik.http.routers.s3.service=s3 - traefik.http.routers.s3_secure.rule=Host(`s3.${STACK_DOMAIN}`) @@ -238,7 +233,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.routers.portainer.middlewares=redirectscheme - traefik.http.routers.portainer.rule=Host(`portainer.${STACK_DOMAIN}`) - traefik.http.routers.portainer_secure.rule=Host(`portainer.${STACK_DOMAIN}`) - traefik.http.routers.portainer_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -274,7 +268,6 @@ services: - traefik.http.middlewares.postgraphile_auth.plugin.body-forward-auth.AuthUrl=http://maevsi:3000/api/auth-proxy - traefik.http.middlewares.postgraphile_cors.headers.accessControlAllowHeaders=authorization,content-type,x-turnstile-key - traefik.http.middlewares.postgraphile_cors.headers.accessControlAllowOriginList=* - - traefik.http.routers.postgraphile.middlewares=redirectscheme - traefik.http.routers.postgraphile.rule=Host(`postgraphile.${STACK_DOMAIN}`) - traefik.http.routers.postgraphile_secure.middlewares=postgraphile_cors,postgraphile_auth - traefik.http.routers.postgraphile_secure.rule=Host(`postgraphile.${STACK_DOMAIN}`) @@ -323,7 +316,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.routers.prometheus.middlewares=redirectscheme - traefik.http.routers.prometheus.rule=Host(`prometheus.${STACK_DOMAIN}`) - traefik.http.routers.prometheus_secure.rule=Host(`prometheus.${STACK_DOMAIN}`) - traefik.http.routers.prometheus_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -337,7 +329,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.routers.rabbitmq.middlewares=redirectscheme - traefik.http.routers.rabbitmq.rule=Host(`rabbitmq.${STACK_DOMAIN}`) - traefik.http.routers.rabbitmq_secure.rule=Host(`rabbitmq.${STACK_DOMAIN}`) - traefik.http.routers.rabbitmq_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -376,7 +367,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.routers.stomper.middlewares=redirectscheme - traefik.http.routers.stomper.rule=Host(`stomper.${STACK_DOMAIN}`) - traefik.http.routers.stomper_secure.rule=Host(`stomper.${STACK_DOMAIN}`) - traefik.http.routers.stomper_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -403,7 +393,6 @@ services: command: - --api=true - --entryPoints.web.address=:80 - - --entryPoints.web-secure.address=:443 - --entryPoints.nuxt.address=:24678 #DARGSTACK-REMOVE - --experimental.plugins.body-forward-auth.moduleName=github.com/PatrickMi/body-forward-auth - --experimental.plugins.body-forward-auth.version=v0.1.2 @@ -416,8 +405,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.middlewares.redirectscheme.redirectscheme.scheme=https - - traefik.http.routers.traefik.middlewares=redirectscheme - traefik.http.routers.traefik.rule=Host(`traefik.${STACK_DOMAIN}`) - traefik.http.routers.traefik_secure.rule=Host(`traefik.${STACK_DOMAIN}`) - traefik.http.routers.traefik_secure.service=api@internal @@ -430,13 +417,10 @@ services: image: traefik:v3.0.1 ports: - mode: host + host_ip: 127.0.0.1 protocol: tcp published: 80 target: 80 - - mode: host - protocol: tcp - published: 443 - target: 443 - mode: host #DARGSTACK-REMOVE protocol: tcp #DARGSTACK-REMOVE published: 24678 #DARGSTACK-REMOVE @@ -451,7 +435,6 @@ services: deploy: labels: - traefik.enable=true - - traefik.http.routers.tusd.middlewares=redirectscheme - traefik.http.routers.tusd.rule=Host(`tusd.${STACK_DOMAIN}`) - traefik.http.routers.tusd_secure.rule=Host(`tusd.${STACK_DOMAIN}`) && (Method(`GET`) || Method(`HEAD`) || Method(`OPTIONS`) || Method(`POST`) || Method(`PUT`) || Method(`PATCH`)) - traefik.http.routers.tusd_secure.tls.options=mintls13@file #DARGSTACK-REMOVE diff --git a/src/production/production.yml b/src/production/production.yml index a6239a33..6050d5fc 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -52,7 +52,6 @@ services: labels: - traefik.enable=true - traefik.http.routers.maevsi_beta.entryPoints=web - - traefik.http.routers.maevsi_beta.middlewares=redirectscheme - traefik.http.routers.maevsi_beta.rule=Host(`beta.${STACK_DOMAIN}`) - traefik.http.routers.maevsi_beta_secure.entryPoints=web-secure - traefik.http.routers.maevsi_beta_secure.middlewares=maevsi_cors From 035162b940b8120ba4c2668cd76e604a9b2e2f52 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 4 Jun 2024 20:44:12 +0000 Subject: [PATCH 17/34] chore(release): 6.0.0-beta.4 [skip ci] ## [6.0.0-beta.4](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.3...6.0.0-beta.4) (2024-06-04) ### Features * **infra:** remove redirect and use port 80 for incoming connections ([353dade](https://github.com/maevsi/maevsi_stack/commit/353dade03ccb22ac5ee281e60c852ee3213d79d6)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d488ecbb..5688f5e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.4](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.3...6.0.0-beta.4) (2024-06-04) + + +### Features + +* **infra:** remove redirect and use port 80 for incoming connections ([353dade](https://github.com/maevsi/maevsi_stack/commit/353dade03ccb22ac5ee281e60c852ee3213d79d6)) + ## [6.0.0-beta.3](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.2...6.0.0-beta.3) (2024-05-27) diff --git a/package.json b/package.json index 93c24153..5a470016 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.3", + "version": "6.0.0-beta.4", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From dd6fcaac10a51524af77ccb8a64a0bdc22d2921b Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Tue, 4 Jun 2024 23:08:52 +0200 Subject: [PATCH 18/34] fix(traefik): remove host_ip property --- src/development/stack.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/development/stack.yml b/src/development/stack.yml index 77c48f06..e16b45f2 100644 --- a/src/development/stack.yml +++ b/src/development/stack.yml @@ -417,7 +417,6 @@ services: image: traefik:v3.0.1 ports: - mode: host - host_ip: 127.0.0.1 protocol: tcp published: 80 target: 80 From cd1ca29549f0ddb1a2eb53705072d7fd9f9e41d9 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 4 Jun 2024 21:13:51 +0000 Subject: [PATCH 19/34] chore(release): 6.0.0-beta.5 [skip ci] ## [6.0.0-beta.5](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.4...6.0.0-beta.5) (2024-06-04) ### Bug Fixes * **traefik:** remove host_ip property ([dd6fcaa](https://github.com/maevsi/maevsi_stack/commit/dd6fcaac10a51524af77ccb8a64a0bdc22d2921b)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5688f5e4..206db4d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.5](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.4...6.0.0-beta.5) (2024-06-04) + + +### Bug Fixes + +* **traefik:** remove host_ip property ([dd6fcaa](https://github.com/maevsi/maevsi_stack/commit/dd6fcaac10a51524af77ccb8a64a0bdc22d2921b)) + ## [6.0.0-beta.4](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.3...6.0.0-beta.4) (2024-06-04) diff --git a/package.json b/package.json index 5a470016..98fdab01 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.4", + "version": "6.0.0-beta.5", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From 2c041955e8dd05bcf0c7faa59ba70988b4a29dd0 Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:09:49 +0200 Subject: [PATCH 20/34] feat(prod): add cloudflared service to production deployment --- src/development/stack.yml | 4 ++-- src/production/production.yml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/development/stack.yml b/src/development/stack.yml index e16b45f2..a062f821 100644 --- a/src/development/stack.yml +++ b/src/development/stack.yml @@ -416,9 +416,9 @@ services: - node.role == manager image: traefik:v3.0.1 ports: - - mode: host + - mode: host #DARGSTACK-REMOVE protocol: tcp - published: 80 + published: 80 #DARGSTACK-REMOVE target: 80 - mode: host #DARGSTACK-REMOVE protocol: tcp #DARGSTACK-REMOVE diff --git a/src/production/production.yml b/src/production/production.yml index 6050d5fc..d2e51130 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -23,6 +23,11 @@ services: labels: - (( append )) - traefik.http.routers.adminer_secure.tls.certresolver=default + cloudflared: + environment: + TUNNEL_TOKEN: token + image: cloudflare/cloudflared + restart: unless-stopped grafana: deploy: labels: From 46b09032b2527e2435910e6cfe3a7dd8fdd2ef0e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 6 Jun 2024 07:11:19 +0000 Subject: [PATCH 21/34] chore(release): 6.0.0-beta.6 [skip ci] ## [6.0.0-beta.6](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.5...6.0.0-beta.6) (2024-06-06) ### Features * **prod:** add cloudflared service to production deployment ([2c04195](https://github.com/maevsi/maevsi_stack/commit/2c041955e8dd05bcf0c7faa59ba70988b4a29dd0)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 206db4d2..7bbafaa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.6](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.5...6.0.0-beta.6) (2024-06-06) + + +### Features + +* **prod:** add cloudflared service to production deployment ([2c04195](https://github.com/maevsi/maevsi_stack/commit/2c041955e8dd05bcf0c7faa59ba70988b4a29dd0)) + ## [6.0.0-beta.5](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.4...6.0.0-beta.5) (2024-06-04) diff --git a/package.json b/package.json index 98fdab01..2839b965 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.5", + "version": "6.0.0-beta.6", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From f822483cc6ee7217dbd3675fffd6552c050dfb80 Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:12:22 +0200 Subject: [PATCH 22/34] feat(production): add command to cloudflare service --- src/production/production.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/production/production.yml b/src/production/production.yml index d2e51130..307410f1 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -24,6 +24,7 @@ services: - (( append )) - traefik.http.routers.adminer_secure.tls.certresolver=default cloudflared: + command: tunnel run environment: TUNNEL_TOKEN: token image: cloudflare/cloudflared From 8f254c2e8e19745a24c84daa4f53dcccdf58e6a4 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 6 Jun 2024 07:13:37 +0000 Subject: [PATCH 23/34] chore(release): 6.0.0-beta.7 [skip ci] ## [6.0.0-beta.7](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.6...6.0.0-beta.7) (2024-06-06) ### Features * **production:** add command to cloudflare service ([f822483](https://github.com/maevsi/maevsi_stack/commit/f822483cc6ee7217dbd3675fffd6552c050dfb80)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bbafaa6..0dea8ac4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.7](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.6...6.0.0-beta.7) (2024-06-06) + + +### Features + +* **production:** add command to cloudflare service ([f822483](https://github.com/maevsi/maevsi_stack/commit/f822483cc6ee7217dbd3675fffd6552c050dfb80)) + ## [6.0.0-beta.6](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.5...6.0.0-beta.6) (2024-06-06) diff --git a/package.json b/package.json index 2839b965..c3e6a166 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.6", + "version": "6.0.0-beta.7", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From 868ba1c7476ab0f9152a576ef737b662892b9b3b Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:23:31 +0200 Subject: [PATCH 24/34] feat(cloudflared): add environment variable --- src/production/production.env.template | 3 ++- src/production/production.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/production/production.env.template b/src/production/production.env.template index 6dffbd15..90b4fd5a 100644 --- a/src/production/production.env.template +++ b/src/production/production.env.template @@ -1,4 +1,5 @@ SENTRY_CRONS= STACK_DOMAIN= TRAEFIK_ACME_EMAIL= -TRAEFIK_ACME_PROVIDER= \ No newline at end of file +TRAEFIK_ACME_PROVIDER= +TUNNEL_TOKEN= \ No newline at end of file diff --git a/src/production/production.yml b/src/production/production.yml index 307410f1..74805595 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -26,7 +26,7 @@ services: cloudflared: command: tunnel run environment: - TUNNEL_TOKEN: token + TUNNEL_TOKEN: ${TUNNEL_TOKEN} image: cloudflare/cloudflared restart: unless-stopped grafana: From 2802f75794745d17ccdd9067d1cdc6a2c4759b0e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 6 Jun 2024 07:24:48 +0000 Subject: [PATCH 25/34] chore(release): 6.0.0-beta.8 [skip ci] ## [6.0.0-beta.8](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.7...6.0.0-beta.8) (2024-06-06) ### Features * **cloudflared:** add environment variable ([868ba1c](https://github.com/maevsi/maevsi_stack/commit/868ba1c7476ab0f9152a576ef737b662892b9b3b)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dea8ac4..b222df20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.8](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.7...6.0.0-beta.8) (2024-06-06) + + +### Features + +* **cloudflared:** add environment variable ([868ba1c](https://github.com/maevsi/maevsi_stack/commit/868ba1c7476ab0f9152a576ef737b662892b9b3b)) + ## [6.0.0-beta.7](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.6...6.0.0-beta.7) (2024-06-06) diff --git a/package.json b/package.json index c3e6a166..cd8c757c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.7", + "version": "6.0.0-beta.8", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From 31710eeb71603ab2ceea186c9ebdf31d223f3cff Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:32:16 +0200 Subject: [PATCH 26/34] fix(traefik): remove whole port definition on production --- src/development/stack.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/development/stack.yml b/src/development/stack.yml index a062f821..6b3cdf98 100644 --- a/src/development/stack.yml +++ b/src/development/stack.yml @@ -415,11 +415,11 @@ services: constraints: - node.role == manager image: traefik:v3.0.1 - ports: + ports: #DARGSTACK-REMOVE - mode: host #DARGSTACK-REMOVE - protocol: tcp + protocol: tcp #DARGSTACK-REMOVE published: 80 #DARGSTACK-REMOVE - target: 80 + target: 80 #DARGSTACK-REMOVE - mode: host #DARGSTACK-REMOVE protocol: tcp #DARGSTACK-REMOVE published: 24678 #DARGSTACK-REMOVE From dbd0a7d2a7855925ebb8cd9df834500646b7ddce Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 6 Jun 2024 07:33:28 +0000 Subject: [PATCH 27/34] chore(release): 6.0.0-beta.9 [skip ci] ## [6.0.0-beta.9](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.8...6.0.0-beta.9) (2024-06-06) ### Bug Fixes * **traefik:** remove whole port definition on production ([31710ee](https://github.com/maevsi/maevsi_stack/commit/31710eeb71603ab2ceea186c9ebdf31d223f3cff)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b222df20..520fc891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.9](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.8...6.0.0-beta.9) (2024-06-06) + + +### Bug Fixes + +* **traefik:** remove whole port definition on production ([31710ee](https://github.com/maevsi/maevsi_stack/commit/31710eeb71603ab2ceea186c9ebdf31d223f3cff)) + ## [6.0.0-beta.8](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.7...6.0.0-beta.8) (2024-06-06) diff --git a/package.json b/package.json index cd8c757c..652e1730 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.8", + "version": "6.0.0-beta.9", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From b4aac5b245f963eaacb26e6defc20aecc5f61c13 Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Thu, 6 Jun 2024 19:59:03 +0200 Subject: [PATCH 28/34] refactor(cloudflared): rename env variable and remove restart option --- src/production/production.env.template | 4 ++-- src/production/production.yml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/production/production.env.template b/src/production/production.env.template index 90b4fd5a..8ffc032b 100644 --- a/src/production/production.env.template +++ b/src/production/production.env.template @@ -1,5 +1,5 @@ +CLOUDFLARED_TUNNEL_TOKEN= SENTRY_CRONS= STACK_DOMAIN= TRAEFIK_ACME_EMAIL= -TRAEFIK_ACME_PROVIDER= -TUNNEL_TOKEN= \ No newline at end of file +TRAEFIK_ACME_PROVIDER= \ No newline at end of file diff --git a/src/production/production.yml b/src/production/production.yml index 74805595..c40c0e41 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -26,9 +26,8 @@ services: cloudflared: command: tunnel run environment: - TUNNEL_TOKEN: ${TUNNEL_TOKEN} + TUNNEL_TOKEN: ${CLOUDFLARED_TUNNEL_TOKEN} image: cloudflare/cloudflared - restart: unless-stopped grafana: deploy: labels: From 4bf518c5487c0f7b499b0721337ffada60713ee6 Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:25:57 +0200 Subject: [PATCH 29/34] refactor(https): use dargstack remove to keep https in development stack --- src/development/stack.yml | 20 +++++++++++++++++++- src/production/production.yml | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/development/stack.yml b/src/development/stack.yml index 6b3cdf98..21548aa0 100644 --- a/src/development/stack.yml +++ b/src/development/stack.yml @@ -99,6 +99,7 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.routers.adminer.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.adminer.rule=Host(`adminer.${STACK_DOMAIN}`) - traefik.http.routers.adminer_secure.rule=Host(`adminer.${STACK_DOMAIN}`) - traefik.http.routers.adminer_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -111,6 +112,7 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.routers.grafana.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.grafana.rule=Host(`grafana.${STACK_DOMAIN}`) - traefik.http.routers.grafana_secure.rule=Host(`grafana.${STACK_DOMAIN}`) - traefik.http.routers.grafana_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -150,10 +152,11 @@ services: - traefik.http.middlewares.maevsi_redirectregex.redirectregex.regex=^https?:\/\/www\.${STACK_DOMAIN}\/(.*) - traefik.http.middlewares.maevsi_redirectregex.redirectregex.replacement=https://${STACK_DOMAIN}/$${2} - traefik.http.routers.maevsi.entryPoints=web + - traefik.http.routers.maevsi.middlewares=redirectscheme,maevsi_redirectregex #DARGSTACK-REMOVE - traefik.http.routers.maevsi.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`) - traefik.http.routers.maevsi.service=maevsi #DARGSTACK-REMOVE - traefik.http.routers.maevsi_secure.entryPoints=web-secure - - traefik.http.routers.maevsi_secure.middlewares=maevsi_cors + - traefik.http.routers.maevsi_secure.middlewares=maevsi_redirectregex,maevsi_cors #DARGSTACK-REMOVE - traefik.http.routers.maevsi_secure.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`) - traefik.http.routers.maevsi_secure.tls.options=mintls13@file #DARGSTACK-REMOVE - traefik.http.routers.maevsi_secure.service=maevsi #DARGSTACK-REMOVE @@ -193,6 +196,7 @@ services: labels: - traefik.enable=true # Minio Console + - traefik.http.routers.minio.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.minio.rule=Host(`minio.${STACK_DOMAIN}`) - traefik.http.routers.minio.service=minio - traefik.http.routers.minio_secure.rule=Host(`minio.${STACK_DOMAIN}`) @@ -201,6 +205,7 @@ services: - traefik.http.services.minio.loadbalancer.server.port=9001 - traefik.http.services.minio.loadbalancer.passhostheader=true # Minio itself + - traefik.http.routers.s3.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.s3.rule=Host(`s3.${STACK_DOMAIN}`) - traefik.http.routers.s3.service=s3 - traefik.http.routers.s3_secure.rule=Host(`s3.${STACK_DOMAIN}`) @@ -233,6 +238,7 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.routers.portainer.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.portainer.rule=Host(`portainer.${STACK_DOMAIN}`) - traefik.http.routers.portainer_secure.rule=Host(`portainer.${STACK_DOMAIN}`) - traefik.http.routers.portainer_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -268,6 +274,7 @@ services: - traefik.http.middlewares.postgraphile_auth.plugin.body-forward-auth.AuthUrl=http://maevsi:3000/api/auth-proxy - traefik.http.middlewares.postgraphile_cors.headers.accessControlAllowHeaders=authorization,content-type,x-turnstile-key - traefik.http.middlewares.postgraphile_cors.headers.accessControlAllowOriginList=* + - traefik.http.routers.postgraphile.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.postgraphile.rule=Host(`postgraphile.${STACK_DOMAIN}`) - traefik.http.routers.postgraphile_secure.middlewares=postgraphile_cors,postgraphile_auth - traefik.http.routers.postgraphile_secure.rule=Host(`postgraphile.${STACK_DOMAIN}`) @@ -316,6 +323,7 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.routers.prometheus.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.prometheus.rule=Host(`prometheus.${STACK_DOMAIN}`) - traefik.http.routers.prometheus_secure.rule=Host(`prometheus.${STACK_DOMAIN}`) - traefik.http.routers.prometheus_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -329,6 +337,7 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.routers.rabbitmq.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.rabbitmq.rule=Host(`rabbitmq.${STACK_DOMAIN}`) - traefik.http.routers.rabbitmq_secure.rule=Host(`rabbitmq.${STACK_DOMAIN}`) - traefik.http.routers.rabbitmq_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -367,6 +376,7 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.routers.stomper.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.stomper.rule=Host(`stomper.${STACK_DOMAIN}`) - traefik.http.routers.stomper_secure.rule=Host(`stomper.${STACK_DOMAIN}`) - traefik.http.routers.stomper_secure.tls.options=mintls13@file #DARGSTACK-REMOVE @@ -393,6 +403,7 @@ services: command: - --api=true - --entryPoints.web.address=:80 + - --entryPoints.web-secure.address=:443 #DARGSTACK-REMOVE - --entryPoints.nuxt.address=:24678 #DARGSTACK-REMOVE - --experimental.plugins.body-forward-auth.moduleName=github.com/PatrickMi/body-forward-auth - --experimental.plugins.body-forward-auth.version=v0.1.2 @@ -405,6 +416,8 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.middlewares.redirectscheme.redirectscheme.scheme=https #DARGSTACK-REMOVE + - traefik.http.routers.traefik.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.traefik.rule=Host(`traefik.${STACK_DOMAIN}`) - traefik.http.routers.traefik_secure.rule=Host(`traefik.${STACK_DOMAIN}`) - traefik.http.routers.traefik_secure.service=api@internal @@ -420,6 +433,10 @@ services: protocol: tcp #DARGSTACK-REMOVE published: 80 #DARGSTACK-REMOVE target: 80 #DARGSTACK-REMOVE + - mode: host #DARGSTACK-REMOVE + protocol: tcp #DARGSTACK-REMOVE + published: 443 #DARGSTACK-REMOVE + target: 443 #DARGSTACK-REMOVE - mode: host #DARGSTACK-REMOVE protocol: tcp #DARGSTACK-REMOVE published: 24678 #DARGSTACK-REMOVE @@ -434,6 +451,7 @@ services: deploy: labels: - traefik.enable=true + - traefik.http.routers.tusd.middlewares=redirectscheme #DARGSTACK-REMOVE - traefik.http.routers.tusd.rule=Host(`tusd.${STACK_DOMAIN}`) - traefik.http.routers.tusd_secure.rule=Host(`tusd.${STACK_DOMAIN}`) && (Method(`GET`) || Method(`HEAD`) || Method(`OPTIONS`) || Method(`POST`) || Method(`PUT`) || Method(`PATCH`)) - traefik.http.routers.tusd_secure.tls.options=mintls13@file #DARGSTACK-REMOVE diff --git a/src/production/production.yml b/src/production/production.yml index c40c0e41..ef5d770d 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -49,6 +49,7 @@ services: labels: - (( append )) - traefik.http.routers.maevsi_secure.tls.certresolver=default + - traefik.http.routers.maevsi_secure.middlewares=maevsi_cors image: ghcr.io/maevsi/maevsi:4.9.0 user: (( prune )) maevsi_beta: From b840c591928fd2aa40128d2ac1ddef3f1a9e7751 Mon Sep 17 00:00:00 2001 From: myyxl <22593897+myyxl@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:36:39 +0200 Subject: [PATCH 30/34] fix(redirect): re-add redirect regex --- src/development/stack.yml | 2 +- src/production/production.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/development/stack.yml b/src/development/stack.yml index 21548aa0..9b1e83b4 100644 --- a/src/development/stack.yml +++ b/src/development/stack.yml @@ -156,7 +156,7 @@ services: - traefik.http.routers.maevsi.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`) - traefik.http.routers.maevsi.service=maevsi #DARGSTACK-REMOVE - traefik.http.routers.maevsi_secure.entryPoints=web-secure - - traefik.http.routers.maevsi_secure.middlewares=maevsi_redirectregex,maevsi_cors #DARGSTACK-REMOVE + - traefik.http.routers.maevsi_secure.middlewares=maevsi_redirectregex,maevsi_cors - traefik.http.routers.maevsi_secure.rule=Host(`${STACK_DOMAIN}`) || Host(`www.${STACK_DOMAIN}`) - traefik.http.routers.maevsi_secure.tls.options=mintls13@file #DARGSTACK-REMOVE - traefik.http.routers.maevsi_secure.service=maevsi #DARGSTACK-REMOVE diff --git a/src/production/production.yml b/src/production/production.yml index ef5d770d..c40c0e41 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -49,7 +49,6 @@ services: labels: - (( append )) - traefik.http.routers.maevsi_secure.tls.certresolver=default - - traefik.http.routers.maevsi_secure.middlewares=maevsi_cors image: ghcr.io/maevsi/maevsi:4.9.0 user: (( prune )) maevsi_beta: From 5a196a04ed8e5cd8fbba84b0268ea7cda16c52b5 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 6 Jun 2024 18:37:41 +0000 Subject: [PATCH 31/34] chore(release): 6.0.0-beta.10 [skip ci] ## [6.0.0-beta.10](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.9...6.0.0-beta.10) (2024-06-06) ### Bug Fixes * **redirect:** re-add redirect regex ([b840c59](https://github.com/maevsi/maevsi_stack/commit/b840c591928fd2aa40128d2ac1ddef3f1a9e7751)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 520fc891..837fef09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.10](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.9...6.0.0-beta.10) (2024-06-06) + + +### Bug Fixes + +* **redirect:** re-add redirect regex ([b840c59](https://github.com/maevsi/maevsi_stack/commit/b840c591928fd2aa40128d2ac1ddef3f1a9e7751)) + ## [6.0.0-beta.9](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.8...6.0.0-beta.9) (2024-06-06) diff --git a/package.json b/package.json index 652e1730..7c9b525e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.9", + "version": "6.0.0-beta.10", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From ce0df8eb2fec054b98748c607eabe77fadbd7cc0 Mon Sep 17 00:00:00 2001 From: Jonas Thelemann Date: Thu, 6 Jun 2024 20:53:07 +0200 Subject: [PATCH 32/34] fix(traefik): do not remove entrypoint in production --- README.md | 4 ++++ src/development/stack.yml | 2 +- src/production/production.yml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 06210d50..798fed11 100644 --- a/README.md +++ b/README.md @@ -165,6 +165,10 @@ This project is deployed in accordance to the [DargStack template](https://githu Values in square brackets are [Docker secrets](https://docs.docker.com/engine/swarm/secrets/). + - ### `cloudflared` ![production](https://img.shields.io/badge/-production-informational.svg?style=flat-square) + + You can configure the secure tunnel at [dash.cloudflare.com](https://dash.cloudflare.com/). + - ### `grafana` You can access the observation dashboard at [grafana.localhost](https://grafana.localhost/). diff --git a/src/development/stack.yml b/src/development/stack.yml index 9b1e83b4..590ebc2c 100644 --- a/src/development/stack.yml +++ b/src/development/stack.yml @@ -403,7 +403,7 @@ services: command: - --api=true - --entryPoints.web.address=:80 - - --entryPoints.web-secure.address=:443 #DARGSTACK-REMOVE + - --entryPoints.web-secure.address=:443 - --entryPoints.nuxt.address=:24678 #DARGSTACK-REMOVE - --experimental.plugins.body-forward-auth.moduleName=github.com/PatrickMi/body-forward-auth - --experimental.plugins.body-forward-auth.version=v0.1.2 diff --git a/src/production/production.yml b/src/production/production.yml index c40c0e41..41229f66 100644 --- a/src/production/production.yml +++ b/src/production/production.yml @@ -24,6 +24,7 @@ services: - (( append )) - traefik.http.routers.adminer_secure.tls.certresolver=default cloudflared: + # You can configure the secure tunnel at [dash.cloudflare.com](https://dash.cloudflare.com/). command: tunnel run environment: TUNNEL_TOKEN: ${CLOUDFLARED_TUNNEL_TOKEN} @@ -48,6 +49,7 @@ services: deploy: labels: - (( append )) + - traefik.http.routers.maevsi.middlewares=maevsi_redirectregex - traefik.http.routers.maevsi_secure.tls.certresolver=default image: ghcr.io/maevsi/maevsi:4.9.0 user: (( prune )) From ac4a225b084ec532b695858b3bd30923d3b3ec86 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 6 Jun 2024 18:54:24 +0000 Subject: [PATCH 33/34] chore(release): 6.0.0-beta.11 [skip ci] ## [6.0.0-beta.11](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.10...6.0.0-beta.11) (2024-06-06) ### Bug Fixes * **traefik:** do not remove entrypoint in production ([ce0df8e](https://github.com/maevsi/maevsi_stack/commit/ce0df8eb2fec054b98748c607eabe77fadbd7cc0)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 837fef09..b1eaa516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.11](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.10...6.0.0-beta.11) (2024-06-06) + + +### Bug Fixes + +* **traefik:** do not remove entrypoint in production ([ce0df8e](https://github.com/maevsi/maevsi_stack/commit/ce0df8eb2fec054b98748c607eabe77fadbd7cc0)) + ## [6.0.0-beta.10](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.9...6.0.0-beta.10) (2024-06-06) diff --git a/package.json b/package.json index 7c9b525e..95e46931 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.10", + "version": "6.0.0-beta.11", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ", From 1a54571451d27192779dbe3e3cb3e8dd405a4f88 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 6 Jun 2024 18:55:58 +0000 Subject: [PATCH 34/34] chore(release): 6.0.0-beta.12 [skip ci] ## [6.0.0-beta.12](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.11...6.0.0-beta.12) (2024-06-06) ### Bug Fixes * **deps:** update ghcr.io/maevsi/maevsi to v4.9.3 ([2137c30](https://github.com/maevsi/maevsi_stack/commit/2137c308d6233a2d122b82d606ebabee7498e6ba)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4020320b..b24f5ee0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.0.0-beta.12](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.11...6.0.0-beta.12) (2024-06-06) + + +### Bug Fixes + +* **deps:** update ghcr.io/maevsi/maevsi to v4.9.3 ([2137c30](https://github.com/maevsi/maevsi_stack/commit/2137c308d6233a2d122b82d606ebabee7498e6ba)) + ## [6.0.0-beta.11](https://github.com/maevsi/maevsi_stack/compare/6.0.0-beta.10...6.0.0-beta.11) (2024-06-06) diff --git a/package.json b/package.json index 164e1615..2a62c40e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "maevsi_stack", "private": true, - "version": "6.0.0-beta.11", + "version": "6.0.0-beta.12", "description": "DargStack configuration for maevsi.", "repository": "https://github.com/maevsi/maevsi_stack.git", "author": "Jonas Thelemann ",