From 1d495e1798d3121a08ddcad8a029135f3c5be1f3 Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 22:45:35 +0200 Subject: [PATCH] ffs --- paperless/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paperless/init.sls b/paperless/init.sls index 08baff3..f361227 100644 --- a/paperless/init.sls +++ b/paperless/init.sls @@ -1,7 +1,7 @@ # Attempt to fix json with pillar variables in variable {% set client_secret = salt['pillar.get']('paperless:webserver:keycloak:client_secret', '') %} {% set oauth_server = salt['pillar.get']('paperless:webserver:keycloak:server_url', 'https:///realms//.well-known/openid-configuration') %} -{% set PAPERLESS_SOCIALACCOUNT_PROVIDERS_ = {'openid_connect': {'APPS': [{'provider_id': 'keycloak', 'name': 'Keycloak', 'client_id': 'paperless', 'secret': client_secret, 'settings': {'server_url': oauth_server} }]} }%} +{% set PAPERLESS_SOCIALACCOUNT_PROVIDERS_ = {'openid_connect': {'APPS': [{'provider_id': 'keycloak', 'name': 'Keycloak', 'client_id': 'paperless', 'secret': client_secret, 'settings': {'server_url': oauth_server} }]} }|loadjson %} broker-data-directory-exists: file.directory: @@ -121,7 +121,7 @@ paperless-docker-container-running: - PAPERLESS_TIKA_ENDPOINT={{ salt['pillar.get']('paperless:webserver:environment:tika_endpoint', 'http://tika:9998') }} - PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ salt['pillar.get']('paperless:webserver:environment:tika_gotenberg_endpoint', 'http://gotenberg:3000') }} - - PAPERLESS_APPS="allauth.socialaccount.providers.openid_connect" + - PAPERLESS_APPS=allauth.socialaccount.providers.openid_connect #- PAPERLESS_SOCIALACCOUNT_PROVIDERS="{{ PAPERLESS_SOCIALACCOUNT_PROVIDERS_ }}" - PAPERLESS_DISABLE_REGULAR_LOGIN={{ salt['pillar.get']('paperless:webserver:environment:disable_regular_login', 'true') }} - PAPERLESS_REDIRECT_LOGIN_TO_SSO={{ salt['pillar.get']('paperless:webserver:environment:redirect_login_to_sso', 'true') }}