diff --git a/uwsgi-python/templates/apps/vampir-mitglieder.j2 b/uwsgi-python/templates/apps/vampir-mitglieder.j2 index 93855ba5c64af1f80c3f91cf26b920f5b4f24b95..478b01c0f5d4df9301d53aabaa6b821613e4ee5d 100644 --- a/uwsgi-python/templates/apps/vampir-mitglieder.j2 +++ b/uwsgi-python/templates/apps/vampir-mitglieder.j2 @@ -1,8 +1,17 @@ from secret_config import secret_key as SECRET_KEY -SQLALCHEMY_DATABASE_URI = 'mysql://{{ app_user }}:{{ app_db_password }}@/{{ app_db_name }}' +SQLALCHEMY_DATABASE_URI = 'psql://{{ 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 + +MAIL_TIMEOUT = 10 +MAIL_USE_LOCALTIME = True diff --git a/uwsgi-python/templates/uwsgi.ini.j2 b/uwsgi-python/templates/uwsgi.ini.j2 index 646e3e790f89f1375cb2f54f5a1dd6a1e2de8c97..0a0e2cec76ff762ddf56a92eba940961ac7efa60 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|default(false) %} +spooler = {{app_spooler_dir|default("spooler")}} +spooler-interval = {{app_spooler_interval|default=30}} +{% 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/vampir-mitglieder.yml b/uwsgi-python/vars/vampir-mitglieder.yml index d0329a041641e9709dbf1840216650777eccf643..6d6445bf9c906f971f4427035a62f91bbc2c8570 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,8 @@ 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_spooler: true