diff --git a/roles/authelia-for-tandoor/info.md b/roles/authelia-for-tandoor/info.md index 5b61b6b..cd33051 100644 --- a/roles/authelia-for-tandoor/info.md +++ b/roles/authelia-for-tandoor/info.md @@ -7,3 +7,4 @@ Um [Tandoor](../tandoor) gegen [Authelia](../authelia) authentifizieren zu lasse - [allauth | OpenID Connect](https://docs.allauth.org/en/latest/socialaccount/providers/openid_connect.html) - [Tandoor-Dokumentation | Configuration Example for Authelia](https://docs.tandoor.dev/features/authentication/#configuration-example-for-authelia) +- https://django-allauth.readthedocs.io/en/latest/socialaccount/providers/authelia.html diff --git a/roles/postgresql-for-tandoor/tasks/main.json b/roles/postgresql-for-tandoor/tasks/main.json index 286d466..0bb0903 100644 --- a/roles/postgresql-for-tandoor/tasks/main.json +++ b/roles/postgresql-for-tandoor/tasks/main.json @@ -15,7 +15,7 @@ "name": "user", "become": true, "become_user": "tandoor", - "community.tandoorql.tandoorql_user": { + "community.postgresql.postgresql_user": { "state": "present", "name": "{{var_postgresql_for_tandoor_username}}", "password": "{{var_postgresql_for_tandoor_password}}" @@ -28,7 +28,7 @@ "name": "schema", "become": true, "become_user": "tandoor", - "community.tandoorql.tandoorql_db": { + "community.postgresql.postgresql_db": { "state": "present", "name": "{{var_postgresql_for_tandoor_schema}}", "owner": "{{var_postgresql_for_tandoor_username}}" @@ -38,7 +38,7 @@ "name": "rights", "become": true, "become_user": "tandoor", - "community.tandoorql.tandoorql_privs": { + "community.postgresql.postgresql_privs": { "state": "present", "db": "{{var_postgresql_for_tandoor_schema}}", "objs": "ALL_IN_SCHEMA", diff --git a/roles/tandoor/info.md b/roles/tandoor/info.md index 4c7603f..e2ced18 100644 --- a/roles/tandoor/info.md +++ b/roles/tandoor/info.md @@ -9,6 +9,8 @@ Für Rezepte-Sammlung [Tandoor](https://tandoor.dev/) - [Tandoor-Dokumentation | Konfiguration](https://docs.tandoor.dev/system/configuration/) - [Tandoor-Dokumentation | Allauth](https://docs.tandoor.dev/features/authentication/#allauth) - https://docs.djangoproject.com/en/5.1/ref/django-admin/#envvar-DJANGO_SUPERUSER_PASSWORD +- [allauth-Dokumentation | OpenID Connect](https://docs.allauth.org/en/latest/socialaccount/providers/openid_connect.html) +- [allauth-Dokumentation | Authelia](https://docs.allauth.org/en/latest/socialaccount/providers/authelia.html) ## ToDo diff --git a/roles/tandoor/templates/conf.j2 b/roles/tandoor/templates/conf.j2 index 463470c..e9f5ae6 100644 --- a/roles/tandoor/templates/conf.j2 +++ b/roles/tandoor/templates/conf.j2 @@ -19,7 +19,9 @@ REMOTE_USER_AUTH=0 {% if var_tandoor_authentication_kind == 'authelia' %} ENABLE_SIGNUP=0 REMOTE_USER_AUTH=1 -SOCIALACCOUNT_PROVIDERS={"openid_connect": {"OAUTH_PKCE_ENABLED": false, "APPS": [{"provider_id": "authelia", "name": "{{var_tandoor_authentication_data_authelia_label}}", "client_id": "{{var_tandoor_authentication_data_authelia_client_id}}", "secret": "{{var_tandoor_authentication_data_authelia_client_secret}}", "settings": {"server_url":"{{var_tandoor_authentication_data_authelia_url_base}}", "token_auth_method": "client_secret_basic", "oauth_pkce_enabled": false}}]}} +SOCIAL_PROVIDERS=allauth.socialaccount.providers.openid +# SOCIALACCOUNT_PROVIDERS={"openid_connect": {"OAUTH_PKCE_ENABLED": false, "APPS": [{"provider_id": "authelia", "name": "{{var_tandoor_authentication_data_authelia_label}}", "client_id": "{{var_tandoor_authentication_data_authelia_client_id}}", "secret": "{{var_tandoor_authentication_data_authelia_client_secret}}", "settings": {"server_url":"{{var_tandoor_authentication_data_authelia_url_base}}", "token_auth_method": "client_secret_basic", "oauth_pkce_enabled": false}}]}} +SOCIALACCOUNT_PROVIDERS={"openid_connect": {"APPS": [{"provider_id": "authelia", "name": "{{var_tandoor_authentication_data_authelia_label}}", "client_id": "{{var_tandoor_authentication_data_authelia_client_id}}", "secret": "{{var_tandoor_authentication_data_authelia_client_secret}}", "settings": {"server_url": "{{var_tandoor_authentication_data_authelia_url_base}}/.well-known/openid-configuration"}}]}} {% endif %} SECRET_KEY={{var_tandoor_secret_key}}