[FIX] Attempt to fix broken json variable parsing
This commit is contained in:
parent
4cf8c5c7d4
commit
f942614e99
1 changed files with 23 additions and 1 deletions
|
@ -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:
|
broker-data-directory-exists:
|
||||||
file.directory:
|
file.directory:
|
||||||
- name: /opt/paperless/broker
|
- 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_URL={{ salt['pillar.get']('paperless:webserver:environment:url', 'https://paperless.flipdot.org') }}
|
||||||
|
|
||||||
- PAPERLESS_APPS="allauth.socialaccount.providers.openid_connect"
|
- 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
|
- restart: always
|
||||||
- networks:
|
- networks:
|
||||||
- paperless-network
|
- paperless-network
|
||||||
|
|
Loading…
Reference in a new issue