diff --git a/.env.sample b/.env.sample index fb454ba..0d70e07 100644 --- a/.env.sample +++ b/.env.sample @@ -198,6 +198,8 @@ COPY_ASSETS="$COPY_ASSETS icon.png|app:/web/dist/assets/icons/" # SECRET_WRITEFREELY_SECRET_VERSION=v1 # APP_ICONS="nextcloud:~/.abra/recipes/authentik/icons/writefreely.png" # WRITEFREELY_APPGROUP="$GROUP_DOCUMENTATION" +# WRITEFREELY_APPNAME=Blog +# WRITEFREELY_APPDESCRIPTION=Writefreely # APPLICATIONS='{"Calendar": {"url":"https://nextcloud.example.com/apps/calendar/", "group": ""}, "BBB": {"url":"https://nextcloud.example.com/apps/bbb/", "group":""}, "Pretix": {"url":"https://pretix.example.com/control/", "group":""}}' # EXTRA_ICONS={"Calendar": "~/.abra/recipes/authentik/icons/calendar.svg", "BBB": "~/.abra/recipes/authentik/icons/bbb.png", "Pretix": "~/.abra/recipes/authentik/icons/pretix.svg"} diff --git a/compose.writefreely.yml b/compose.writefreely.yml index 837a455..9b8a19d 100644 --- a/compose.writefreely.yml +++ b/compose.writefreely.yml @@ -6,6 +6,8 @@ services: - writefreely_secret environment: - WRITEFREELY_DOMAIN + - WRITEFREELY_APPNAME + - WRITEFREELY_APPDESCRIPTION configs: - source: writefreely target: /blueprints/writefreely.yaml diff --git a/writefreely.yaml.tmpl b/writefreely.yaml.tmpl index 6a64991..ee781a0 100644 --- a/writefreely.yaml.tmpl +++ b/writefreely.yaml.tmpl @@ -40,22 +40,26 @@ entries: signing_key: !Find [authentik_crypto.certificatekeypair, [name, authentik Self-signed Certificate]] sub_mode: user_username token_validity: days=30 + grant_types: + - authorization_code + - refresh_token conditions: [] id: writefreely_provider identifiers: - pk: 9988 + pk: 9987 model: authentik_providers_oauth2.oauth2provider state: present - attrs: - meta_launch_url: https://{{ env "WRITEFREELY_DOMAIN" }} + meta_description: "{{ env "WRITEFREELY_APPDESCRIPTION" }}" + meta_launch_url: https://{{ env "WRITEFREELY_DOMAIN" }} + name: "{{ if eq (env "WRITEFREELY_APPNAME") "" }}Writefreely{{ else }}{{ env "WRITEFREELY_APPNAME" }}{{ end }}" open_in_new_tab: true policy_engine_mode: any provider: !KeyOf writefreely_provider - slug: writefreely conditions: [] id: writefreely_application identifiers: - name: Writefreely + slug: writefreely model: authentik_core.application state: present