From a296aa88cc228dca758b0e018c9cf34ba3bdb105 Mon Sep 17 00:00:00 2001 From: Kristian Date: Sun, 26 Nov 2023 19:58:27 +0100 Subject: [PATCH 1/7] changed homepage to 2024 --- volunteers/templates/static/promo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/volunteers/templates/static/promo.html b/volunteers/templates/static/promo.html index 64bb67b..cfc21b9 100644 --- a/volunteers/templates/static/promo.html +++ b/volunteers/templates/static/promo.html @@ -17,7 +17,7 @@

FOSDEM
Volunteering

  • Location

    -

    FOSDEM 2023 will be returning the the ULB in Brussels, Belgium, while continuing to offer an online presence.

    +

    FOSDEM 2024 will be returning the the ULB in Brussels, Belgium, while continuing to offer an online presence.

  • Volunteering

    From 6d1b225801dfaedc0f44aa062d905003824c2cb7 Mon Sep 17 00:00:00 2001 From: Kristian Date: Sun, 26 Nov 2023 20:00:07 +0100 Subject: [PATCH 2/7] removed librechat link from homepage --- volunteers/templates/static/promo.html | 1 - 1 file changed, 1 deletion(-) diff --git a/volunteers/templates/static/promo.html b/volunteers/templates/static/promo.html index cfc21b9..d65b87e 100644 --- a/volunteers/templates/static/promo.html +++ b/volunteers/templates/static/promo.html @@ -36,7 +36,6 @@

    FOSDEM
    Volunteering

    Real time chat is bridged between matrix and irc:

    • From 9b5fbe070668d0b06720ee740c293adc14006372 Mon Sep 17 00:00:00 2001 From: Kristian Date: Sun, 26 Nov 2023 20:05:03 +0100 Subject: [PATCH 3/7] Added Dan, removed plaintext email addresses --- volunteers/templates/static/promo.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/volunteers/templates/static/promo.html b/volunteers/templates/static/promo.html index d65b87e..020b210 100644 --- a/volunteers/templates/static/promo.html +++ b/volunteers/templates/static/promo.html @@ -42,9 +42,11 @@

    FOSDEM
    Volunteering

  • Real People

    Pieter De Praetere

    -

    pieter@fosdem.org

    +

    Send Pieter an email

    Kristian Schuhmacher

    -

    kristian@fosdem.org

    +

    Send Kristian an email

    +

    Dan Clark

    +

    Send Dan an email

    • {% endblock %} From 2a2bca1ea4a3811fbdff20e5e9e9d638ae35d6d8 Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Sun, 17 Dec 2023 17:03:18 +0100 Subject: [PATCH 4/7] Commit last changes to playbook --- .../roles/fosdem_volunteers/tasks/main.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml b/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml index 7a4de69..3a9e319 100644 --- a/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml +++ b/deployment/playbook/roles/fosdem_volunteers/tasks/main.yml @@ -3,9 +3,8 @@ name: "{{item}}" state: present with_items: - - python - nginx - - virtualenv + - python3-venv - name: "Create system user {{app_user}}" user: name: "{{app_user}}" @@ -20,15 +19,13 @@ repo: https://github.com/FOSDEM/volunteers.git dest: "{{base_dir}}/tool" version: master - become: yes - become_user: "{{app_user}}" register: app_updated notify: Restart fosdem_volunteers - name: Install dependencies inside a virtual environment pip: virtualenv: "{{base_dir}}/venv3" virtualenv_python: python3 - requirements: "{{base_dir}}/tool/requirements.txt" + requirements: "{{base_dir}}/tool/requirements-frozen.txt" become: yes become_user: "{{app_user}}" - name: Add gunicorn to venv @@ -62,6 +59,16 @@ - migrate - collectstatic when: app_updated.changed +- name: install the tmpfiles.d conf + become: true + copy: + content: d /run/volunteers 0755 {{ app_user }} {{ app_user }} - - + dest: /usr/lib/tmpfiles.d/fosdem_volunteers.conf + +- name: configure tmpfiles.d + become: true + command: systemd-tmpfiles --create + - name: Create systemd service file template: dest: /etc/systemd/system/fosdem_volunteers.service From a7c4469d91ec0cae3433bc2e5da46e4eea7efe0e Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Sun, 17 Dec 2023 17:05:40 +0100 Subject: [PATCH 5/7] Remove old pentabarf template --- volunteers/templates/volunteers/tasks.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/volunteers/templates/volunteers/tasks.html b/volunteers/templates/volunteers/tasks.html index 75c8665..b9b42ae 100644 --- a/volunteers/templates/volunteers/tasks.html +++ b/volunteers/templates/volunteers/tasks.html @@ -6,15 +6,6 @@ {% block content %} -{#{% if user.is_authenticated and not user_in_penta %} -

    -

    Register in pentabarf!

    - Please register an account in pentabarf and add it to your details to enable hosting talks. -
    -

    - -{% endif %} -#} {% if user.is_authenticated %}View your schedule{% endif %}
    {% csrf_token %} From c17780eb25909e644afd2d90a4b0da06edb23613 Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Sun, 17 Dec 2023 21:26:37 +0100 Subject: [PATCH 6/7] Remove virtual specific code --- volunteers/models.py | 49 ++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/volunteers/models.py b/volunteers/models.py index 755f5be..648f8f6 100644 --- a/volunteers/models.py +++ b/volunteers/models.py @@ -144,37 +144,24 @@ def sync_with_penta(cls): rooms = day.findall('room') for room in rooms: room_name = room.get('name') - if edition.digital_edition: - needs_hosting = False - if room_name.startswith('S'): - # skip import of stands - continue - if room_name[0] in ['L', 'M'] or room_name in ["D.blockchain"]: - needs_hosting = True - events = room.findall('event') - for event in events: - talk = Talk.penta_create_or_update(event, edition, day_date) - if needs_hosting: - Task.create_or_update_from_talk(edition, talk, 'Hosting', [1, 2, 3]) - else: - # Lightning talks are done manually since the time slots are so small. - needs_heralding = False - needs_video = False - - if room_name in ['Janson', 'K.1.105 (La Fontaine)']: - needs_heralding = True - needs_video = getattr(settings, 'IMPORT_VIDEO_TASKS', True) - - events = room.findall('event') - for event in events: - talk = Talk.penta_create_or_update(event, edition, day_date) - ###################### - # Tasks, if required # - ###################### - if needs_heralding: - Task.create_or_update_from_talk(edition, talk, 'Heralding', [3, 2, 5]) - if needs_video: - Task.create_or_update_from_talk(edition, talk, 'Video', [1, 1, 1]) + # Lightning talks are done manually since the time slots are so small. + needs_heralding = False + needs_video = False + + if room_name in ['Janson', 'K.1.105 (La Fontaine)']: + needs_heralding = True + needs_video = getattr(settings, 'IMPORT_VIDEO_TASKS', True) + + events = room.findall('event') + for event in events: + talk = Talk.penta_create_or_update(event, edition, day_date) + ###################### + # Tasks, if required # + ###################### + if needs_heralding: + Task.create_or_update_from_talk(edition, talk, 'Heralding', [3, 2, 5]) + if needs_video: + Task.create_or_update_from_talk(edition, talk, 'Video', [1, 1, 1]) """ From 40d991b203ae06287bd4e9230ec13a2e59fc9c7a Mon Sep 17 00:00:00 2001 From: Johan Van de Wauw Date: Sun, 17 Dec 2023 21:29:00 +0100 Subject: [PATCH 7/7] Remove request for penta id we may still need pretalx account, but lets add that when we have it --- volunteers/views.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/volunteers/views.py b/volunteers/views.py index e7bd20b..a98eb16 100644 --- a/volunteers/views.py +++ b/volunteers/views.py @@ -37,11 +37,6 @@ def check_profile_completeness(request, volunteer): if request.user != volunteer.user: return True - if not volunteer.penta_account_name: - messages.warning(request, _( - "Hey there! If you want to be a host for a talk, you must register on Pentabarf at https://penta.fosdem.org/submission/"), - fail_silently=True) - if not volunteer.mobile_nbr: messages.warning(request, _( "Hey there! It seems you didn't give us a phone number. Please update your profile, to make sure we can contact you if the network fails..."),