From 36f9d091e4994d8ab8cc2f17f2b808d1631f0812 Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 22:39:28 +0200 Subject: [PATCH 1/7] ffs --- paperless/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperless/init.sls b/paperless/init.sls index 2077575..08baff3 100644 --- a/paperless/init.sls +++ b/paperless/init.sls @@ -122,7 +122,7 @@ paperless-docker-container-running: - PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ salt['pillar.get']('paperless:webserver:environment:tika_gotenberg_endpoint', 'http://gotenberg:3000') }} - PAPERLESS_APPS="allauth.socialaccount.providers.openid_connect" - - PAPERLESS_SOCIALACCOUNT_PROVIDERS="{{ PAPERLESS_SOCIALACCOUNT_PROVIDERS_ }}" + #- 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') }} From 1d495e1798d3121a08ddcad8a029135f3c5be1f3 Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 22:45:35 +0200 Subject: [PATCH 2/7] 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') }} From bfbaf515c228a30900db73df845f92c389663e80 Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 22:46:57 +0200 Subject: [PATCH 3/7] ffs --- paperless/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperless/init.sls b/paperless/init.sls index f361227..22294d3 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} }]} }|loadjson %} +{% set PAPERLESS_SOCIALACCOUNT_PROVIDERS_ = {'openid_connect': {'APPS': [{'provider_id': 'keycloak', 'name': 'Keycloak', 'client_id': 'paperless', 'secret': client_secret, 'settings': {'server_url': oauth_server} }]} }|tojson %} broker-data-directory-exists: file.directory: From 372260220306b3e9e5a34a7e97df20773b2f5490 Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 22:47:31 +0200 Subject: [PATCH 4/7] ffs --- paperless/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperless/init.sls b/paperless/init.sls index 22294d3..e91ee48 100644 --- a/paperless/init.sls +++ b/paperless/init.sls @@ -122,7 +122,7 @@ paperless-docker-container-running: - PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ salt['pillar.get']('paperless:webserver:environment:tika_gotenberg_endpoint', 'http://gotenberg:3000') }} - PAPERLESS_APPS=allauth.socialaccount.providers.openid_connect - #- PAPERLESS_SOCIALACCOUNT_PROVIDERS="{{ PAPERLESS_SOCIALACCOUNT_PROVIDERS_ }}" + - 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') }} From 3a9f812be1b53eb72ed3f8f4d95b14d923eb4b7b Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 22:48:59 +0200 Subject: [PATCH 5/7] ffs --- paperless/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperless/init.sls b/paperless/init.sls index e91ee48..edf7524 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} }]} }|tojson %} +{% set PAPERLESS_SOCIALACCOUNT_PROVIDERS_ = "{'openid_connect': {'APPS': [{'provider_id': 'keycloak', 'name': 'Keycloak', 'client_id': 'paperless', 'secret': client_secret, 'settings': {'server_url': oauth_server} }]} }"|tojson %} broker-data-directory-exists: file.directory: From 1d43361c72c5383a62f4d20c8f7debc242943d3d Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 22:54:06 +0200 Subject: [PATCH 6/7] ffs --- paperless/init.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paperless/init.sls b/paperless/init.sls index edf7524..b3d25e4 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} }]} }"|tojson %} +{% set PAPERLESS_SOCIALACCOUNT_PROVIDERS_ = {'openid_connect': {'APPS': [{'provider_id': 'keycloak', 'name': 'Keycloak', 'client_id': 'paperless', 'secret': client_secret, 'settings': {'server_url': oauth_server} }]} }|tojson %} broker-data-directory-exists: file.directory: @@ -122,7 +122,7 @@ paperless-docker-container-running: - PAPERLESS_TIKA_GOTENBERG_ENDPOINT={{ salt['pillar.get']('paperless:webserver:environment:tika_gotenberg_endpoint', 'http://gotenberg:3000') }} - PAPERLESS_APPS=allauth.socialaccount.providers.openid_connect - - PAPERLESS_SOCIALACCOUNT_PROVIDERS="{{ PAPERLESS_SOCIALACCOUNT_PROVIDERS_ }}" + - 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') }} From 71306a2cd14e8affd914568e0472a006b6fc523c Mon Sep 17 00:00:00 2001 From: Bltzz Date: Tue, 22 Oct 2024 23:00:59 +0200 Subject: [PATCH 7/7] ffs --- paperless/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paperless/init.sls b/paperless/init.sls index b3d25e4..ee34835 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} }]} }|tojson %} +{% set PAPERLESS_SOCIALACCOUNT_PROVIDERS_ = {'openid_connect':{'APPS':[{'provider_id': 'keycloak', 'name': 'Keycloak', 'client_id': 'paperless', 'secret': client_secret, 'settings':{'server_url': oauth_server}}]}}|tojson%} broker-data-directory-exists: file.directory: