Merge branch 'vampir-mitglieder-update' into 'master'

Update vampir-mitglieder

See merge request !34

uwsgi-python/tasks/apps/vampir-mitglieder.yml

 ---
 
+# https://github.com/ansible/ansible/issues/42983
+- name: ensure there exists a .ansible folder
+  file:
+    path: "{{app_path}}/.ansible"
+    state: directory
+    owner: "{{app_user}}"
+    group: "{{app_group}}"
+
+- name: ensure data model upgrades are applied  # noqa 301
+  command: "{{app_venv}}/bin/flask db upgrade"
+  args:
+    chdir: "{{app_path}}"
+  become: true
+  become_user: "{{app_user}}"
+  notify:
+    - "restart uwsgi instance {{app.instance}}"
+
 - name: ensure we have a folder for invoices
   file:
     path: "{{ app_path }}/rechnungen"
@@ -7,3 +24,25 @@
     owner: "{{ app_user }}"
     group: "{{ app_group }}"
     mode: '0750'
+
+- name: ensure the celery unit file exists
+  template:
+    src: apps/vampir-mitglieder-celery.service.j2
+    dest: "/etc/systemd/system/{{ app_name }}-celery.service"
+    owner: root
+    group: root
+    mode: '0644'
+  notify:
+    - reload systemd service files
+    - "restart uwsgi instance {{app.instance}}"
+
+- name: ensure the celery service is enabled
+  service:
+    name: "{{app_name}}-celery"
+    enabled: true
+    state: started
+
+- name: ensure the folder from above is not present anymore
+  file:
+    path: "{{app_path}}/.ansible"
+    state: absent

uwsgi-python/templates/apps/vampir-mitglieder-celery.service.j2

+[Unit]
+Description={{ app_name }}-Celery
+After=network.target
+
+[Service]
+User={{ app_user }}
+Group={{ app_group }}
+WorkingDirectory={{ app_path }}
+Environment=VIRTUAL_ENV="{{ app_path }}"
+ExecStart={{ app_venv }}/bin/celery -A app.celery worker --loglevel=DEBUG --concurrency={{ vampir_mitglieder_celery_concurrency }}
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

uwsgi-python/templates/apps/vampir-mitglieder.j2

@@ -17,4 +17,4 @@ SENDER_MAIL_ADDRESS = "{{ app_sender_mail_address }}"
 MAIL_TIMEOUT = 10
 MAIL_USE_LOCALTIME = True
 
-NO_SPOOLER = False
+CELERY_BROKER_URL = "{{ vampir_mitglieder_celery_broker }}"

uwsgi-python/vars/vampir-mitglieder.yml

@@ -39,5 +39,5 @@ 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"
+vampir_mitglieder_celery_broker: 'redis://localhost:6379/1'
+vampir_mitglieder_celery_concurrency: 2