flipdot/paperless-formula
23
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

[FIX] Attempt to fix broken json variable parsing

Browse source
This commit is contained in:
Bltzz 2024-10-20 17:19:05 +02:00
parent 4cf8c5c7d4
commit f942614e99
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
paperless/init.sls
View file

@ -1,3 +1,25 @@
# Attempt to fix json with pillar variables in variable
{% set client_secret = salt['pillar.get']('paperless:webserver:keycloak:client_secret', '<CLIENT_SECRET>') %}
{% set oauth_server = salt['pillar.get']('paperless:webserver:keycloak:server_url', 'https://<KEYCLOAK_SERVER>/realms/<REALM>/.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
}
}
]
}
}
%}
broker-data-directory-exists:
file.directory:
- name: /opt/paperless/broker
@ -69,7 +91,7 @@ paperless-docker-container-running:
# - PAPERLESS_URL={{ salt['pillar.get']('paperless:webserver:environment:url', 'https://paperless.flipdot.org') }}
- PAPERLESS_APPS="allauth.socialaccount.providers.openid_connect"
- PAPERLESS_SOCIALACCOUNT_PROVIDERS='{"openid_connect": {"APPS": [{"provider_id": "keycloak", "name": "Keycloak", "client_id": "paperless", "secret": {{ salt['pillar.get']('paperless:webserver:keycloak:client_secret', '<CLIENT_SECRET>') }}, "settings": {"server_url": {{ salt['pillar.get']('paperless:webserver:keycloak:server_url', 'https://<KEYCLOAK_SERVER>/realms/<REALM>/.well-known/openid-configuration') }} }}]}}'
#- PAPERLESS_SOCIALACCOUNT_PROVIDERS='{"openid_connect": {"APPS": [{"provider_id": "keycloak", "name": "Keycloak", "client_id": "paperless", "secret": {{ salt['pillar.get']('paperless:webserver:keycloak:client_secret', '<CLIENT_SECRET>') }}, "settings": {"server_url": {{ salt['pillar.get']('paperless:webserver:keycloak:server_url', 'https://<KEYCLOAK_SERVER>/realms/<REALM>/.well-known/openid-configuration') }} }}]}}'
- restart: always
- networks:
- paperless-network