From 54302ca2ac8e45e7c7536056ea1795b16f5019de Mon Sep 17 00:00:00 2001
From: Hinrikus Wolf <hinrikus@fsmpi.rwth-aachen.de>
Date: Thu, 3 Jun 2021 19:35:22 +0200
Subject: [PATCH] implement Lars' feedback
---
uwsgi-python/tasks/app.yml | 2 +-
uwsgi-python/tasks/apps/vampir-mitglieder.yml | 2 +-
uwsgi-python/templates/apps/vampir-mitglieder.j2 | 1 +
uwsgi-python/templates/uwsgi.ini.j2 | 4 ++--
uwsgi-python/vars/default.yml | 4 ++++
uwsgi-python/vars/vampir-mitglieder.yml | 1 +
6 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/uwsgi-python/tasks/app.yml b/uwsgi-python/tasks/app.yml
index 23f10a6..54bbca3 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 4a827a6..8b9227f 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 ba6a2b3..b844ff3 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 e6a1232..d4ed139 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 6b834dc..19db69f 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 6a3d6b2..4e5c8d2 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"
--
GitLab