From eaa5f240469b251361bb0aea93de62bdae9a8f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Sun, 12 Jan 2025 10:05:20 +0100 Subject: [PATCH] [task-230] [mod] kleine Anpassungen --- roles/authelia-for-tandoor/info.md | 4 +--- roles/tandoor/defaults/main.json | 5 +++++ roles/tandoor/info.md | 4 ++-- roles/tandoor/tasks/main.json | 12 +++++++++++- roles/tandoor/templates/conf.j2 | 8 ++++++++ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/roles/authelia-for-tandoor/info.md b/roles/authelia-for-tandoor/info.md index cd33051..d9c0efb 100644 --- a/roles/authelia-for-tandoor/info.md +++ b/roles/authelia-for-tandoor/info.md @@ -5,6 +5,4 @@ Um [Tandoor](../tandoor) gegen [Authelia](../authelia) authentifizieren zu lasse ## Verweise -- [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 +- [allauth-Dokumentation | Authelia](https://django-allauth.readthedocs.io/en/latest/socialaccount/providers/authelia.html) diff --git a/roles/tandoor/defaults/main.json b/roles/tandoor/defaults/main.json index d44b357..ea267ea 100644 --- a/roles/tandoor/defaults/main.json +++ b/roles/tandoor/defaults/main.json @@ -14,6 +14,11 @@ "var_tandoor_authentication_data_authelia_client_secret": "REPLACE_ME", "var_tandoor_authentication_data_authelia_url_base": "https://authelia.example.org", "var_tandoor_authentication_data_authelia_label": "Authelia", + "var_tandoor_smtp_host": "smtp.example.org", + "var_tandoor_smtp_port": 587, + "var_tandoor_smtp_username": "tandoor@smtp.example.org", + "var_tandoor_smtp_password": "REPLACE_ME", + "var_tandoor_notification_sender": "notification@tandoor.example.org", "var_tandoor_secret_key": "REPLACE_ME", "var_tandoor_admin_username": "admin", "var_tandoor_admin_password": "REPLACE_ME", diff --git a/roles/tandoor/info.md b/roles/tandoor/info.md index e2ced18..dc339bf 100644 --- a/roles/tandoor/info.md +++ b/roles/tandoor/info.md @@ -8,11 +8,11 @@ Für Rezepte-Sammlung [Tandoor](https://tandoor.dev/) - [Tandoor-Dokumentation | Installation](https://docs.tandoor.dev/install/manual/) - [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 +- [Django-Dokumentation | Variable `DJANGO_SUPERUSER_PASSWORD`](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 -- E-Mail +- Idempotenz diff --git a/roles/tandoor/tasks/main.json b/roles/tandoor/tasks/main.json index 16e1f5e..b9ee618 100644 --- a/roles/tandoor/tasks/main.json +++ b/roles/tandoor/tasks/main.json @@ -98,7 +98,7 @@ }, { - "name": "frontend stuff", + "name": "frontend stuff | core", "become": true, "become_user": "{{var_tandoor_user}}", "ansible.builtin.shell": { @@ -106,6 +106,16 @@ "cmd": "yarnpkg install && yarnpkg build" } }, + { + "name": "frontend stuff | link", + "become": true, + "become_user": "{{var_tandoor_user}}", + "ansible.builtin.file": { + "type": "link", + "src": "{{var_tandoor_directory}}/program/cookbook/static/vue", + "dest": "{{var_tandoor_directory}}/program/staticfiles/vue", + } + }, { "name": "systemd unit", "become": true, diff --git a/roles/tandoor/templates/conf.j2 b/roles/tandoor/templates/conf.j2 index e9f5ae6..4837105 100644 --- a/roles/tandoor/templates/conf.j2 +++ b/roles/tandoor/templates/conf.j2 @@ -24,6 +24,14 @@ SOCIAL_PROVIDERS=allauth.socialaccount.providers.openid 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 %} +EMAIL_HOST={{var_tandoor_smtp_host}} +EMAIL_PORT={{var_tandoor_smtp_port | string}} +EMAIL_HOST_USER={{var_tandoor_smtp_username}} +EMAIL_HOST_PASSWORD={{var_tandoor_smtp_password}} +EMAIL_USE_TLS=1 +EMAIL_USE_SSL=0 +DEFAULT_FROM_EMAIL={{var_tandoor_notification_sender}} + SECRET_KEY={{var_tandoor_secret_key}} ALLOWED_HOSTS={{var_tandoor_domain}}