ffs

paperless/init.sls

@@ -1,24 +1,7 @@
 # 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
-              }
-            }
-        ]
-    }
-  } 
-%}
+{% 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,28 +105,6 @@ tika-docker-container-running:
     - networks:
       - paperless-network
 
-# 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
-              }
-            }
-        ]
-    }
-  }
-%}
-
 paperless-docker-container-running:
   docker_container.running:
     # The Docker setup does not use the configuration file.
@@ -161,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') }}