WIP upgrade
This commit is contained in:
parent
bf2397b0e9
commit
68eda3e2d7
|
@ -23,7 +23,7 @@ steps:
|
||||||
FLOW_INVALIDATION_VERSION: v1
|
FLOW_INVALIDATION_VERSION: v1
|
||||||
FLOW_RECOVERY_VERSION: v1
|
FLOW_RECOVERY_VERSION: v1
|
||||||
FLOW_TRANSLATION_VERSION: v1
|
FLOW_TRANSLATION_VERSION: v1
|
||||||
SYSTEM_TENANT_VERSION: v1
|
SYSTEM_BRAND_VERSION: v1
|
||||||
NEXTCLOUD_CONFIG_VERSION: v1
|
NEXTCLOUD_CONFIG_VERSION: v1
|
||||||
SECRET_SECRET_KEY_VERSION: v1
|
SECRET_SECRET_KEY_VERSION: v1
|
||||||
SECRET_DB_PASSWORD_VERSION: v1
|
SECRET_DB_PASSWORD_VERSION: v1
|
||||||
|
|
|
@ -167,8 +167,8 @@ The `abra.sh` function `apply_blueprints` needs to be executed to deactivate the
|
||||||
- Default - Source enrollment flow
|
- Default - Source enrollment flow
|
||||||
- OVERWRITE:
|
- OVERWRITE:
|
||||||
- `default-source-enrollment-field-username`
|
- `default-source-enrollment-field-username`
|
||||||
- Custom System Tenant
|
- Custom System Brand
|
||||||
- Default - Tenant
|
- Default - Brand
|
||||||
- APPEND: `authentik_brands.brand domain: authentik-default`
|
- APPEND: `authentik_brands.brand domain: authentik-default`
|
||||||
- Recovery with email verification
|
- Recovery with email verification
|
||||||
- USE:
|
- USE:
|
||||||
|
@ -177,8 +177,8 @@ The `abra.sh` function `apply_blueprints` needs to be executed to deactivate the
|
||||||
|
|
||||||
### Blueprint Dependency Execution Order
|
### Blueprint Dependency Execution Order
|
||||||
|
|
||||||
5. Custom System Tenant
|
5. Custom System Brand
|
||||||
- Default - Tenant
|
- Default - Brand
|
||||||
1. Recovery with email verification
|
1. Recovery with email verification
|
||||||
- Default - Authentication flow
|
- Default - Authentication flow
|
||||||
- Default - Password change flow
|
- Default - Password change flow
|
||||||
|
|
10
abra.sh
10
abra.sh
|
@ -1,17 +1,17 @@
|
||||||
export CUSTOM_CSS_VERSION=v2
|
export CUSTOM_CSS_VERSION=v2
|
||||||
export FLOW_AUTHENTICATION_VERSION=v3
|
export FLOW_AUTHENTICATION_VERSION=v4
|
||||||
export FLOW_INVITATION_VERSION=v2
|
export FLOW_INVITATION_VERSION=v2
|
||||||
export FLOW_INVALIDATION_VERSION=v2
|
export FLOW_INVALIDATION_VERSION=v2
|
||||||
export FLOW_RECOVERY_VERSION=v1
|
export FLOW_RECOVERY_VERSION=v1
|
||||||
export FLOW_TRANSLATION_VERSION=v3
|
export FLOW_TRANSLATION_VERSION=v3
|
||||||
export SYSTEM_TENANT_VERSION=v3
|
export SYSTEM_BRAND_VERSION=v3
|
||||||
export NEXTCLOUD_CONFIG_VERSION=v1
|
export NEXTCLOUD_CONFIG_VERSION=v1
|
||||||
export WORDPRESS_CONFIG_VERSION=v2
|
export WORDPRESS_CONFIG_VERSION=v2
|
||||||
export MATRIX_CONFIG_VERSION=v1
|
export MATRIX_CONFIG_VERSION=v1
|
||||||
export WEKAN_CONFIG_VERSION=v3
|
export WEKAN_CONFIG_VERSION=v3
|
||||||
export VIKUNJA_CONFIG_VERSION=v1
|
export VIKUNJA_CONFIG_VERSION=v1
|
||||||
export OUTLINE_CONFIG_VERSION=v1
|
export OUTLINE_CONFIG_VERSION=v2
|
||||||
export RALLLY_CONFIG_VERSION=v1
|
export RALLLY_CONFIG_VERSION=v2
|
||||||
export HEDGEDOC_CONFIG_VERSION=v1
|
export HEDGEDOC_CONFIG_VERSION=v1
|
||||||
export MONITORING_CONFIG_VERSION=v1
|
export MONITORING_CONFIG_VERSION=v1
|
||||||
export DB_ENTRYPOINT_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()
|
Flow.objects.filter(slug__in=delete_flows).delete()
|
||||||
Stage.objects.filter(flow=None).delete()
|
Stage.objects.filter(flow=None).delete()
|
||||||
Prompt.objects.filter(promptstage=None).delete()
|
Prompt.objects.filter(promptstage=None).delete()
|
||||||
Tenant.objects.filter(default=True).delete()
|
Brand.objects.filter(default=True).delete()
|
||||||
""" 2>&1 | quieten
|
""" 2>&1 | quieten
|
||||||
apply_blueprints
|
apply_blueprints
|
||||||
}
|
}
|
||||||
|
|
12
compose.yml
12
compose.yml
|
@ -76,7 +76,7 @@ services:
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "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.customFrameOptionsValue=SAMEORIGIN"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-frameOptions.headers.contentSecurityPolicy=frame-ancestors ${X_FRAME_OPTIONS_ALLOW_FROM}"
|
- "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.2"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
|
|
||||||
worker:
|
worker:
|
||||||
|
@ -108,8 +108,8 @@ services:
|
||||||
target: /blueprints/3_flow_translation.yaml
|
target: /blueprints/3_flow_translation.yaml
|
||||||
- source: flow_invitation
|
- source: flow_invitation
|
||||||
target: /blueprints/4_flow_invitation.yaml
|
target: /blueprints/4_flow_invitation.yaml
|
||||||
- source: system_tenant
|
- source: system_brand
|
||||||
target: /blueprints/5_system_tenant.yaml
|
target: /blueprints/5_system_brand.yaml
|
||||||
- source: flow_invalidation
|
- source: flow_invalidation
|
||||||
target: /blueprints/6_flow_invalidation.yaml
|
target: /blueprints/6_flow_invalidation.yaml
|
||||||
environment: *env
|
environment: *env
|
||||||
|
@ -210,9 +210,9 @@ configs:
|
||||||
name: ${STACK_NAME}_flow_translation_${FLOW_TRANSLATION_VERSION}
|
name: ${STACK_NAME}_flow_translation_${FLOW_TRANSLATION_VERSION}
|
||||||
file: flow_translation.yaml.tmpl
|
file: flow_translation.yaml.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
system_tenant:
|
system_brand:
|
||||||
name: ${STACK_NAME}_system_tenant_${SYSTEM_TENANT_VERSION}
|
name: ${STACK_NAME}_system_brand_${SYSTEM_BRAND_VERSION}
|
||||||
file: system_tenant.yaml.tmpl
|
file: system_brand.yaml.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
db_entrypoint:
|
db_entrypoint:
|
||||||
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
|
||||||
|
|
|
@ -384,7 +384,7 @@ entries:
|
||||||
enabled: {{ if eq (env "LOGOUT_REDIRECT") "" }} false {{ else }} true {{ end }}
|
enabled: {{ if eq (env "LOGOUT_REDIRECT") "" }} false {{ else }} true {{ end }}
|
||||||
timeout: 30
|
timeout: 30
|
||||||
|
|
||||||
######## System Tenant ##########
|
######## System Brand ##########
|
||||||
- attrs:
|
- attrs:
|
||||||
attributes:
|
attributes:
|
||||||
settings:
|
settings:
|
||||||
|
@ -401,5 +401,5 @@ entries:
|
||||||
flow_user_settings: !Find [authentik_flows.flow, [slug, default-user-settings-flow]]
|
flow_user_settings: !Find [authentik_flows.flow, [slug, default-user-settings-flow]]
|
||||||
identifiers:
|
identifiers:
|
||||||
pk: 047cce25-aae2-4b02-9f96-078e155f803d
|
pk: 047cce25-aae2-4b02-9f96-078e155f803d
|
||||||
id: system_tenant
|
id: system_brand
|
||||||
model: authentik_brands.brand
|
model: authentik_brands.brand
|
||||||
|
|
|
@ -37,7 +37,7 @@ entries:
|
||||||
name: default-authentication-login
|
name: default-authentication-login
|
||||||
model: authentik_stages_user_login.userloginstage
|
model: authentik_stages_user_login.userloginstage
|
||||||
attrs:
|
attrs:
|
||||||
session_duration: seconds=0
|
session_duration: days=30
|
||||||
|
|
||||||
# After the first run this will produce a RelatedObjectDoesNotExist error
|
# After the first run this will produce a RelatedObjectDoesNotExist error
|
||||||
- identifiers:
|
- identifiers:
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Due to blueprint changes, you need to run the following command after upgrading: abra app cmd -C <Domain> worker apply_blueprints
|
|
@ -2,13 +2,13 @@ version: 1
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
blueprints.goauthentik.io/instantiate: "true"
|
blueprints.goauthentik.io/instantiate: "true"
|
||||||
name: Custom System Tenant
|
name: Custom System brand
|
||||||
entries:
|
entries:
|
||||||
### DEPENDENCIES
|
### DEPENDENCIES
|
||||||
- model: authentik_blueprints.metaapplyblueprint
|
- model: authentik_blueprints.metaapplyblueprint
|
||||||
attrs:
|
attrs:
|
||||||
identifiers:
|
identifiers:
|
||||||
name: Default - Tenant
|
name: Default - Brand
|
||||||
required: true
|
required: true
|
||||||
- model: authentik_blueprints.metaapplyblueprint
|
- model: authentik_blueprints.metaapplyblueprint
|
||||||
attrs:
|
attrs:
|
||||||
|
@ -17,8 +17,8 @@ entries:
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
|
|
||||||
### SYSTEM TENANT
|
### SYSTEM BRAND
|
||||||
# remove custom tenant from old recipe
|
# remove custom brand from old recipe
|
||||||
- identifiers:
|
- identifiers:
|
||||||
domain: {{ env "DOMAIN" }}
|
domain: {{ env "DOMAIN" }}
|
||||||
model: authentik_brands.brand
|
model: authentik_brands.brand
|
Loading…
Reference in New Issue