Compare commits

...

3 Commits

Author SHA1 Message Date
Simon 75f42db773 chore: publish 5.1.0+2024.2.3 release
continuous-integration/drone/push Build is failing Details
continuous-integration/drone/tag Build is passing Details
2024-04-18 11:32:33 +02:00
Simon d115d5ce38 Merge branch 'main' of ssh://git.coopcloud.tech:2222/coop-cloud/authentik 2024-04-18 10:56:04 +02:00
Simon 68eda3e2d7 WIP upgrade 2024-04-17 14:59:23 +02:00
7 changed files with 25 additions and 25 deletions

View File

@ -23,7 +23,7 @@ steps:
FLOW_INVALIDATION_VERSION: v1
FLOW_RECOVERY_VERSION: v1
FLOW_TRANSLATION_VERSION: v1
SYSTEM_TENANT_VERSION: v1
SYSTEM_BRAND_VERSION: v1
NEXTCLOUD_CONFIG_VERSION: v1
SECRET_SECRET_KEY_VERSION: v1
SECRET_DB_PASSWORD_VERSION: v1

View File

@ -167,8 +167,8 @@ The `abra.sh` function `apply_blueprints` needs to be executed to deactivate the
- Default - Source enrollment flow
- OVERWRITE:
- `default-source-enrollment-field-username`
- Custom System Tenant
- Default - Tenant
- Custom System Brand
- Default - Brand
- APPEND: `authentik_brands.brand domain: authentik-default`
- Recovery with email verification
- USE:
@ -177,8 +177,8 @@ The `abra.sh` function `apply_blueprints` needs to be executed to deactivate the
### Blueprint Dependency Execution Order
5. Custom System Tenant
- Default - Tenant
5. Custom System Brand
- Default - Brand
1. Recovery with email verification
- Default - Authentication flow
- Default - Password change flow

10
abra.sh
View File

@ -1,17 +1,17 @@
export CUSTOM_CSS_VERSION=v2
export FLOW_AUTHENTICATION_VERSION=v3
export FLOW_AUTHENTICATION_VERSION=v4
export FLOW_INVITATION_VERSION=v2
export FLOW_INVALIDATION_VERSION=v2
export FLOW_RECOVERY_VERSION=v1
export FLOW_TRANSLATION_VERSION=v3
export SYSTEM_TENANT_VERSION=v3
export SYSTEM_BRAND_VERSION=v3
export NEXTCLOUD_CONFIG_VERSION=v1
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 RALLLY_CONFIG_VERSION=v1
export OUTLINE_CONFIG_VERSION=v2
export RALLLY_CONFIG_VERSION=v2
export HEDGEDOC_CONFIG_VERSION=v1
export MONITORING_CONFIG_VERSION=v1
export DB_ENTRYPOINT_VERSION=v1
@ -218,7 +218,7 @@ delete_flows = ['default-recovery-flow' , 'custom-authentication-flow' , 'invita
Flow.objects.filter(slug__in=delete_flows).delete()
Stage.objects.filter(flow=None).delete()
Prompt.objects.filter(promptstage=None).delete()
Tenant.objects.filter(default=True).delete()
Brand.objects.filter(default=True).delete()
""" 2>&1 | quieten
apply_blueprints
}

View File

@ -32,7 +32,7 @@ x-env: &env
version: '3.8'
services:
app:
image: ghcr.io/goauthentik/server:2024.2.2
image: ghcr.io/goauthentik/server:2024.2.3
command: server
depends_on:
- db
@ -76,11 +76,11 @@ 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=5.0.2+2024.2.2"
- "coop-cloud.${STACK_NAME}.version=5.1.0+2024.2.3"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
worker:
image: ghcr.io/goauthentik/server:2024.2.2
image: ghcr.io/goauthentik/server:2024.2.3
command: worker
depends_on:
- db
@ -108,8 +108,8 @@ services:
target: /blueprints/3_flow_translation.yaml
- source: flow_invitation
target: /blueprints/4_flow_invitation.yaml
- source: system_tenant
target: /blueprints/5_system_tenant.yaml
- source: system_brand
target: /blueprints/5_system_brand.yaml
- source: flow_invalidation
target: /blueprints/6_flow_invalidation.yaml
environment: *env
@ -210,9 +210,9 @@ configs:
name: ${STACK_NAME}_flow_translation_${FLOW_TRANSLATION_VERSION}
file: flow_translation.yaml.tmpl
template_driver: golang
system_tenant:
name: ${STACK_NAME}_system_tenant_${SYSTEM_TENANT_VERSION}
file: system_tenant.yaml.tmpl
system_brand:
name: ${STACK_NAME}_system_brand_${SYSTEM_BRAND_VERSION}
file: system_brand.yaml.tmpl
template_driver: golang
db_entrypoint:
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}

View File

@ -384,7 +384,7 @@ entries:
enabled: {{ if eq (env "LOGOUT_REDIRECT") "" }} false {{ else }} true {{ end }}
timeout: 30
######## System Tenant ##########
######## System Brand ##########
- attrs:
attributes:
settings:
@ -401,5 +401,5 @@ entries:
flow_user_settings: !Find [authentik_flows.flow, [slug, default-user-settings-flow]]
identifiers:
pk: 047cce25-aae2-4b02-9f96-078e155f803d
id: system_tenant
id: system_brand
model: authentik_brands.brand

View File

@ -37,7 +37,7 @@ entries:
name: default-authentication-login
model: authentik_stages_user_login.userloginstage
attrs:
session_duration: seconds=0
session_duration: days=30
# After the first run this will produce a RelatedObjectDoesNotExist error
- identifiers:

View File

@ -2,13 +2,13 @@ version: 1
metadata:
labels:
blueprints.goauthentik.io/instantiate: "true"
name: Custom System Tenant
name: Custom System brand
entries:
### DEPENDENCIES
- model: authentik_blueprints.metaapplyblueprint
attrs:
identifiers:
name: Default - Tenant
name: Default - Brand
required: true
- model: authentik_blueprints.metaapplyblueprint
attrs:
@ -17,8 +17,8 @@ entries:
required: true
### SYSTEM TENANT
# remove custom tenant from old recipe
### SYSTEM BRAND
# remove custom brand from old recipe
- identifiers:
domain: {{ env "DOMAIN" }}
model: authentik_brands.brand