diff --git a/uwsgi-python/tasks/app.yml b/uwsgi-python/tasks/app.yml index 23f10a690485ea90eb41be1cd3e8ee96ccb5d8ac..54bbca3bede325bd3b67d13dc21712cf56383d8e 100644 --- a/uwsgi-python/tasks/app.yml +++ b/uwsgi-python/tasks/app.yml @@ -348,7 +348,7 @@ owner: "{{ app_user }}" group: "{{ app_group }}" mode: '0750' - when: app_spooler|default(false) + when: app_spooler - meta: flush_handlers diff --git a/uwsgi-python/tasks/apps/vampir-mitglieder.yml b/uwsgi-python/tasks/apps/vampir-mitglieder.yml index 4a827a6de23e62e20c7a8efc1e138f52addcd923..8b9227ffdd500246753452c3bd329169807f4cfa 100644 --- a/uwsgi-python/tasks/apps/vampir-mitglieder.yml +++ b/uwsgi-python/tasks/apps/vampir-mitglieder.yml @@ -2,7 +2,7 @@ - name: ensure we have a folder for invoices file: - path: "{{ app_path}}/rechnungen" + path: "{{ app_path }}/rechnungen" state: directory owner: "{{ app_user }}" group: "{{ app_group }}" diff --git a/uwsgi-python/templates/apps/vampir-mitglieder.j2 b/uwsgi-python/templates/apps/vampir-mitglieder.j2 index ba6a2b3aa72011d78daebd24a1ca2e61611d728a..b844ff3c3b7c1fdd9b7b736164422e51560fe2a8 100644 --- a/uwsgi-python/templates/apps/vampir-mitglieder.j2 +++ b/uwsgi-python/templates/apps/vampir-mitglieder.j2 @@ -12,6 +12,7 @@ TESTING_MAILS = ["{{ app_testing_mails }}"] MAIL_SERVER = "{{ app_mail_server }}" MAIL_USE_TLS = True +SENDER_MAIL_ADDRESS = "{{ app_sender_mail_address }}" MAIL_TIMEOUT = 10 MAIL_USE_LOCALTIME = True diff --git a/uwsgi-python/templates/uwsgi.ini.j2 b/uwsgi-python/templates/uwsgi.ini.j2 index e6a123242b3d492518b9ad3d7b32b7e04398bb14..d4ed13905405b49fa343b865c016bba718444fae 100644 --- a/uwsgi-python/templates/uwsgi.ini.j2 +++ b/uwsgi-python/templates/uwsgi.ini.j2 @@ -32,9 +32,9 @@ env = {{ env }} {% for mule in range(app_mules|default(0)) %} mule = {% endfor %} -{% if app_spooler|default(false) %} +{% if app_spooler %} spooler = {{app_spooler_dir}} -spooler-interval = {{app_spooler_interval|default(30)}} +spooler-interval = {{app_spooler_interval}} {% endif %} #umask = 227 chdir = {{app_chdir}} diff --git a/uwsgi-python/vars/default.yml b/uwsgi-python/vars/default.yml index 6b834dc888ad237c04da89e45d740a3586462fd8..19db69f7963872ef41652089c460d77ba8697487 100644 --- a/uwsgi-python/vars/default.yml +++ b/uwsgi-python/vars/default.yml @@ -43,3 +43,7 @@ app_requirements_file: requirements.txt app_config_file: config.py app_secret_config: true app_secret_config_keys: [] + +app_spooler: false +app_spooler_interval: 30 +app_spooler_dir: "{{app_path}}/spooler" diff --git a/uwsgi-python/vars/vampir-mitglieder.yml b/uwsgi-python/vars/vampir-mitglieder.yml index 6a3d6b246bd6c24a4466573f5599678033650eaa..4e5c8d296525b14ebbcab418eb9c737e11d810cd 100644 --- a/uwsgi-python/vars/vampir-mitglieder.yml +++ b/uwsgi-python/vars/vampir-mitglieder.yml @@ -37,6 +37,7 @@ app_branding_description: > app_mail_server: "mail.fsmpi.rwth-aachen.de" app_testing_mails: "vampir-vorstand@fsmpi.rwth-aachen.de" +app_sender_mail_address: "vampir-vorstand@fsmpi.rwth-aachen.de" app_spooler: true app_spooler_dir: "{{app_path}}/spooler"