diff --git a/uwsgi-python/tasks/app.yml b/uwsgi-python/tasks/app.yml index c0ff9a56b3e9cf38b8d080ecf8f9e9f034245c16..54bbca3bede325bd3b67d13dc21712cf56383d8e 100644 --- a/uwsgi-python/tasks/app.yml +++ b/uwsgi-python/tasks/app.yml @@ -341,6 +341,15 @@ - "{{ app.app }}" - "{{ app.instance }}" +- name: ensure we have a spooler dir if needed + file: + path: "{{ app_spooler_dir }}" + state: directory + owner: "{{ app_user }}" + group: "{{ app_group }}" + mode: '0750' + when: app_spooler + - meta: flush_handlers - name: ensure the service is enabled diff --git a/uwsgi-python/tasks/apps/vampir-mitglieder.yml b/uwsgi-python/tasks/apps/vampir-mitglieder.yml new file mode 100644 index 0000000000000000000000000000000000000000..8b9227ffdd500246753452c3bd329169807f4cfa --- /dev/null +++ b/uwsgi-python/tasks/apps/vampir-mitglieder.yml @@ -0,0 +1,9 @@ +--- + +- name: ensure we have a folder for invoices + file: + path: "{{ app_path }}/rechnungen" + state: directory + owner: "{{ app_user }}" + group: "{{ app_group }}" + mode: '0750' diff --git a/uwsgi-python/templates/apps/vampir-mitglieder.j2 b/uwsgi-python/templates/apps/vampir-mitglieder.j2 index 93855ba5c64af1f80c3f91cf26b920f5b4f24b95..b844ff3c3b7c1fdd9b7b736164422e51560fe2a8 100644 --- a/uwsgi-python/templates/apps/vampir-mitglieder.j2 +++ b/uwsgi-python/templates/apps/vampir-mitglieder.j2 @@ -1,8 +1,20 @@ from secret_config import secret_key as SECRET_KEY -SQLALCHEMY_DATABASE_URI = 'mysql://{{ app_user }}:{{ app_db_password }}@/{{ app_db_name }}' +SQLALCHEMY_DATABASE_URI = 'postgresql://{{ app_user }}:@/{{ app_db_name }}' SQLALCHEMY_TRACK_MODIFICATIONS = False DEBUG = False SESSION_COOKIE_SECURE = True BRANDING_TITLE = "{{ app_branding_title }}" BRANDING_DESCRIPTION = """{{ app_branding_description }}""" + +OVERRIDE_MAIL_DESTINATION = False +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 + +NO_SPOOLER = False diff --git a/uwsgi-python/templates/uwsgi.ini.j2 b/uwsgi-python/templates/uwsgi.ini.j2 index 646e3e790f89f1375cb2f54f5a1dd6a1e2de8c97..d4ed13905405b49fa343b865c016bba718444fae 100644 --- a/uwsgi-python/templates/uwsgi.ini.j2 +++ b/uwsgi-python/templates/uwsgi.ini.j2 @@ -17,7 +17,7 @@ cheaper-initial = 1 cheaper-step = 1 {% if app_enable_threads|default(false) %} -enable-threads = +enable-threads = single-interpreter = true {% endif %} {% for option in app_uwsgi_options|default([]) %} @@ -30,15 +30,19 @@ env = {{ env }} {% endfor %} {% for mule in range(app_mules|default(0)) %} -mule = +mule = {% endfor %} +{% if app_spooler %} +spooler = {{app_spooler_dir}} +spooler-interval = {{app_spooler_interval}} +{% endif %} #umask = 227 chdir = {{app_chdir}} uid = {{app_user}} gid = {{app_group}} log-date = -log-4xx = -log-5xx = +log-4xx = +log-5xx = log-x-forwarded-for = {% if app_lang == "python" %} {% if app_python_version == 2 %} 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 d0329a041641e9709dbf1840216650777eccf643..4e5c8d296525b14ebbcab418eb9c737e11d810cd 100644 --- a/uwsgi-python/vars/vampir-mitglieder.yml +++ b/uwsgi-python/vars/vampir-mitglieder.yml @@ -17,7 +17,7 @@ app_enable_threads: false app_uwsgi_options: [] app_db_name: vampir -app_db_type: mysql +app_db_type: postgres app_additional_software: [] @@ -34,3 +34,10 @@ app_branding_title: "Vampir Mitgliederdatenbank" app_branding_description: > Verwaltungsinterface zur Mitgliederdatenbank des Vereins der Alumni der Fachschaft Mathematik/Physik/Informatik an der RWTH Aachen e.V. + +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"