From 89ac783dc3e97d9a8c1a7b8a04a5e85ad6f2f81f Mon Sep 17 00:00:00 2001 From: Dominik Kaminski Date: Mon, 11 Sep 2023 21:20:04 +0200 Subject: [PATCH] chore(collabora): Quote strings --- .gitlab-ci.yml | 5 +++-- helmfile/apps/collabora/values.yaml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0e495fc..dc3f53d7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -463,8 +463,7 @@ generate-release-assets: - when: "never" script: - | - # yamllint disable-line rule:line-length - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}/bmi/souveraener_arbeitsplatz/tooling/opendesk-asset-generator + git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@${CI_SERVER_HOST}/${ASSET_GENERATOR_REPO_PATH} cd opendesk-asset-generator export OPENDESK_DEPLOYMENT_AUTOMATION_PATH=${CI_PROJECT_DIR} ./opendesk_asset_generator.py @@ -477,6 +476,8 @@ generate-release-assets: - "./build_artefacts/chart-index.json" - "./build_artefacts/image-index.json" tags: [] + variables: + ASSET_GENERATOR_REPO_PATH: "bmi/souveraener_arbeitsplatz/tooling/opendesk-asset-generator" # Declare .environments which is in environments repository and only loaded when INCLUDE_ENVIRONMENTS_ENABLED not false. diff --git a/helmfile/apps/collabora/values.yaml b/helmfile/apps/collabora/values.yaml index b062ca19..46afbde8 100644 --- a/helmfile/apps/collabora/values.yaml +++ b/helmfile/apps/collabora/values.yaml @@ -41,8 +41,8 @@ ingress: balance url_param WOPISrc check_post hash-type consistent # HAProxy - Community: https://haproxy-ingress.github.io/ - haproxy-ingress.github.io/timeout-tunnel: 3600s - haproxy-ingress.github.io/balance-algorithm: url_param WOPISrc check_post + haproxy-ingress.github.io/timeout-tunnel: "3600s" + haproxy-ingress.github.io/balance-algorithm: "url_param WOPISrc check_post" haproxy-ingress.github.io/config-backend: | hash-type consistent # block admin urls from outside