From 287426b06a84a2d99788bb9a0bc909a9a5c8a1a9 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 8 Feb 2024 00:22:17 +0100 Subject: [PATCH] chore: publish 4.1.0+2023.10.5 release --- .env.sample | 6 ++++++ abra.sh | 1 + compose.outline.yml | 26 ++++++++++++++++++++++++++ compose.yml | 2 +- icons/outline.png | Bin 0 -> 7113 bytes outline.yaml.tmpl | 43 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 compose.outline.yml create mode 100644 icons/outline.png create mode 100644 outline.yaml.tmpl diff --git a/.env.sample b/.env.sample index c46b54a..37ae296 100644 --- a/.env.sample +++ b/.env.sample @@ -78,6 +78,12 @@ COPY_ASSETS="$COPY_ASSETS icon.png|app:/web/dist/assets/icons/" # SECRET_VIKUNJA_SECRET_VERSION=v1 # APP_ICONS="$APP_ICONS vikunja:~/.abra/recipes/authentik/icons/vikunja.svg" +# COMPOSE_FILE="$COMPOSE_FILE:compose.outline.yml" +# OUTLINE_DOMAIN=outline.example.com +# SECRET_OUTLINE_ID_VERSION=v1 +# SECRET_OUTLINE_SECRET_VERSION=v1 +# APP_ICONS="$APP_ICONS outline:~/.abra/recipes/authentik/icons/outline.png" + # COMPOSE_FILE="$COMPOSE_FILE:compose.monitoring.yml" # MONITORING_DOMAIN=monitoring.example.com # SECRET_MONITORING_ID_VERSION=v1 diff --git a/abra.sh b/abra.sh index 942cc15..0b32a42 100644 --- a/abra.sh +++ b/abra.sh @@ -10,6 +10,7 @@ export WORDPRESS_CONFIG_VERSION=v2 export MATRIX_CONFIG_VERSION=v1 export WEKAN_CONFIG_VERSION=v3 export VIKUNJA_CONFIG_VERSION=v1 +export OUTLINE_CONFIG_VERSION=v1 export MONITORING_CONFIG_VERSION=v1 export DB_ENTRYPOINT_VERSION=v1 diff --git a/compose.outline.yml b/compose.outline.yml new file mode 100644 index 0000000..27eb6aa --- /dev/null +++ b/compose.outline.yml @@ -0,0 +1,26 @@ +version: "3.8" +services: + worker: + secrets: + - outline_id + - outline_secret + environment: + - OUTLINE_DOMAIN + configs: + - source: outline + target: /blueprints/outline.yaml + +secrets: + outline_id: + external: true + name: ${STACK_NAME}_outline_id_${SECRET_OUTLINE_ID_VERSION} + outline_secret: + external: true + name: ${STACK_NAME}_outline_secret_${SECRET_OUTLINE_SECRET_VERSION} + + +configs: + outline: + name: ${STACK_NAME}_outline_${OUTLINE_CONFIG_VERSION} + file: outline.yaml.tmpl + template_driver: golang diff --git a/compose.yml b/compose.yml index 58c6f92..7ed057b 100644 --- a/compose.yml +++ b/compose.yml @@ -76,7 +76,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.customFrameOptionsValue=SAMEORIGIN" - "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.contentSecurityPolicy=frame-ancestors ${X_FRAME_OPTIONS_ALLOW_FROM}" - - "coop-cloud.${STACK_NAME}.version=4.0.0+2023.10.5" + - "coop-cloud.${STACK_NAME}.version=4.1.0+2023.10.5" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" worker: diff --git a/icons/outline.png b/icons/outline.png new file mode 100644 index 0000000000000000000000000000000000000000..77997b1704443df8034d4270515c5bc924a41177 GIT binary patch literal 7113 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 MxAoNCpzR|52k24b3IG5A literal 0 HcmV?d00001 diff --git a/outline.yaml.tmpl b/outline.yaml.tmpl new file mode 100644 index 0000000..035bbcc --- /dev/null +++ b/outline.yaml.tmpl @@ -0,0 +1,43 @@ +version: 1 +metadata: + labels: + blueprints.goauthentik.io/instantiate: "true" + name: outline + +entries: + +- attrs: + access_code_validity: minutes=1 + authorization_flow: !Find [authentik_flows.flow, [slug, default-provider-authorization-implicit-consent]] + client_id: {{ secret "outline_id" }} + client_secret: {{ secret "outline_secret" }} + client_type: confidential + include_claims_in_id_token: true + issuer_mode: per_provider + name: Outline + property_mappings: + - !Find [authentik_providers_oauth2.scopemapping, [scope_name, openid]] + - !Find [authentik_providers_oauth2.scopemapping, [scope_name, email]] + - !Find [authentik_providers_oauth2.scopemapping, [scope_name, profile]] + signing_key: !Find [authentik_crypto.certificatekeypair, [name, authentik Self-signed Certificate]] + sub_mode: hashed_user_id + token_validity: days=30 + conditions: [] + id: outline_provider + identifiers: + pk: 9995 + model: authentik_providers_oauth2.oauth2provider + state: present + +- attrs: + meta_launch_url: https://{{ env "OUTLINE_DOMAIN" }} + open_in_new_tab: true + policy_engine_mode: any + provider: !KeyOf outline_provider + slug: outline + conditions: [] + id: outline_application + identifiers: + name: Outline + model: authentik_core.application + state: present