diff --git a/roles/tandoor/defaults/main.json b/roles/tandoor/defaults/main.json index 224657a..d44b357 100644 --- a/roles/tandoor/defaults/main.json +++ b/roles/tandoor/defaults/main.json @@ -12,8 +12,11 @@ "var_tandoor_authentication_kind": "internal", "var_tandoor_authentication_data_authelia_client_id": "REPLACE_ME", "var_tandoor_authentication_data_authelia_client_secret": "REPLACE_ME", - "var_tandoor_authentication_data_authelia_url_base": "authelia.example.org", + "var_tandoor_authentication_data_authelia_url_base": "https://authelia.example.org", "var_tandoor_authentication_data_authelia_label": "Authelia", "var_tandoor_secret_key": "REPLACE_ME", + "var_tandoor_admin_username": "admin", + "var_tandoor_admin_password": "REPLACE_ME", + "var_tandoor_admin_email": "admin@tandoor.example.org", "var_tandoor_domain": "tandoor.exmaple.org" } diff --git a/roles/tandoor/info.md b/roles/tandoor/info.md index b2a9cb2..a3e9653 100644 --- a/roles/tandoor/info.md +++ b/roles/tandoor/info.md @@ -8,4 +8,8 @@ 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.allauth.org/en/latest/socialaccount/providers/openid_connect.html + + +## ToDo + +- E-Mail diff --git a/roles/tandoor/tasks/main.json b/roles/tandoor/tasks/main.json index 8ee1648..16e1f5e 100644 --- a/roles/tandoor/tasks/main.json +++ b/roles/tandoor/tasks/main.json @@ -7,11 +7,11 @@ "pkg": [ "git", "gcc", + "libpq-dev", "libldap2-dev", "libsasl2-dev", "python3-venv", "python3-dev", - "gunicorn", "nodejs", "yarnpkg" ] @@ -57,12 +57,22 @@ "requirements": "{{var_tandoor_directory}}/program/requirements.txt" } }, + { + "name": "configuration", + "become": true, + "become_user": "{{var_tandoor_user}}", + "ansible.builtin.template": { + "src": "conf.j2", + "dest": "{{var_tandoor_directory}}/program/.env", + "mode": "644" + } + }, { "name": "initialize", "become": true, "become_user": "{{var_tandoor_user}}", "environment": { - "VIRTUAL_ENV": "{{var_tandoor_directory}}/program", + "VIRTUAL_ENV": "{{var_tandoor_directory}}/program" }, "loop": [ "migrate", @@ -74,6 +84,19 @@ "cmd": "bin/python3 manage.py {{item}}" } }, + { + "name": "admin account", + "become": true, + "become_user": "{{var_tandoor_user}}", + "environment": { + "VIRTUAL_ENV": "{{var_tandoor_directory}}/program" + }, + "ansible.builtin.shell": { + "chdir": "{{var_tandoor_directory}}/program", + "cmd": "DJANGO_SUPERUSER_PASSWORD={{var_tandoor_admin_password}} bin/python3 manage.py createsuperuser --no-input --username {{var_tandoor_admin_username}} --email {{var_tandoor_admin_email}}" + } + }, + { "name": "frontend stuff", "become": true, @@ -83,15 +106,6 @@ "cmd": "yarnpkg install && yarnpkg build" } }, - { - "name": "configuration", - "become": true, - "become_user": "{{var_tandoor_user}}", - "ansible.builtin.template": { - "src": "conf.j2", - "dest": "{{var_tandoor_directory}}/program/.env" - } - }, { "name": "systemd unit", "become": true, diff --git a/roles/tandoor/templates/systemd-unit.j2 b/roles/tandoor/templates/systemd-unit.j2 index ae79624..ad9dfc8 100644 --- a/roles/tandoor/templates/systemd-unit.j2 +++ b/roles/tandoor/templates/systemd-unit.j2 @@ -10,7 +10,7 @@ User={{var_tandoor_user}} Group=www-data WorkingDirectory={{var_tandoor_directory}}/program EnvironmentFile={{var_tandoor_directory}}/program/.env -ExecStart={{var_tandoor_directory}}/program/bin/gunicorn --error-logfile {{var_tandoor_directory}}/program/gunicorn_err.log --log-level info --capture-output --bind unix:{{var_tandoor_directory}}/program/recipes.sock recipes.wsgi:application +ExecStart={{var_tandoor_directory}}/program/bin/gunicorn --capture-output --bind unix:{{var_tandoor_directory}}/program/recipes.sock recipes.wsgi:application [Install] WantedBy=multi-user.target