From 9b211a6fae7fe74d4acb5b97532aa21082f11fd9 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Tue, 18 Feb 2020 16:16:15 +0200 Subject: [PATCH 1/5] Add global event variables Create global variables to configure the event --- ansible/group_vars/all/default.yml | 125 +++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/ansible/group_vars/all/default.yml b/ansible/group_vars/all/default.yml index 2f693f24..f944fedc 100644 --- a/ansible/group_vars/all/default.yml +++ b/ansible/group_vars/all/default.yml @@ -24,3 +24,128 @@ node_exporter_enabled_collectors: unit-whitelist: "'.+\\.service'" - textfile: directory: "{{ node_exporter_textfile_dir }}" + +event: + name: FOSDEM + fullname: FOSDEM 2020 + year: 2020 + startdate: "2020-02-01" + enddate: "2020-02-02" + +rooms: +- name: AW1.120 + streamname: aw1120 + recorded: yes +- name: AW1.121 + streamname: aw1121 + recorded: yes +- name: AW1.125 + streamname: aw1125 + recorded: yes +- name: AW1.126 + streamname: aw1126 + recorded: yes +- name: H.1301 + namesake: Cornil + streamname: h1301 + recorded: yes +- name: H.1302 + namesake: Depage + streamname: h1302 + recorded: yes +- name: H.1308 + namesake: Rolin + streamname: h1308 + recorded: yes +- name: H.1309 + namesake: Van Rijn + streamname: h1309 + recorded: yes +- name: H.2213 + streamname: h2213 + recorded: yes +- name: H.2214 + streamname: h2214 + recorded: yes +- name: H.2215 + namesake: Ferrer + streamname: h2215 + recorded: yes +- name: H.3242 + streamname: h3242 + recorded: no +- name: H.3244 + streamname: h3244 + recorded: no +- name: J.1.106 + recorded: no +- name: Janson + streamname: janson + recorded: yes +- name: K.1.105 + namesake: La Fontaine + streamname: k1105 + recorded: yes +- name: K.3.201 + streamname: k3201 + recorded: yes +- name: K.3.401 + streamname: k3401 + recorded: yes +- name: K.4.201 + streamname: k4201 + recorded: yes +- name: K.4.401 + streamname: k4401 + recorded: yes +- name: K.4.601 + streamname: k4601 + recorded: yes +- name: UA2.114 + streamname: ua2114 + namesake: Baudoux + recorded: yes +- name: UA2.118 + streamname: ua2118 + namesake: Henriot + recorded: yes +- name: UA2.220 + streamname: ua2110 + namesake: Guilissen + recorded: yes +- name: UB2.147 + streamname: ub2147 + recorded: yes +- name: UB2.252A + streamname: ub2252a + namesake: Lameere + recorded: yes +- name: UB4.132 + recorded: no +- name: UB4.136 + streamname: ub4136 + recorded: yes +- name: UB4.228 + recorded: no +- name: UB5.132 + streamname: ub5132 + recorded: yes +- name: UB5.230 + streamname: ub5230 + recorded: yes +- name: UD2.119 + streamname: ud2119 + recorded: yes +- name: UD2.120 + namesake: Chavanne + streamname: ud2120 + recorded: yes +- name: UD2.208 + namesake: Decroly + streamname: ud2208 + recorded: yes +- name: UD2.218A + streamname: ud2218a + recorded: yes +- name: UD2.Corridor + recorded: no From a4891591fecaeca581f7a4d1353dae3c7c650d79 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Tue, 18 Feb 2020 17:35:19 +0200 Subject: [PATCH 2/5] Generate these as templates, rather than hardcoding the lists --- .../roles/video-control-server/files/all.html | 397 ------------------ .../roles/video-control-server/files/aw.html | 85 ---- .../video-control-server/files/cams.html | 224 ---------- .../roles/video-control-server/files/h.html | 80 ---- .../roles/video-control-server/files/j.html | 42 -- .../roles/video-control-server/files/k.html | 74 ---- .../roles/video-control-server/files/ua.html | 67 --- .../roles/video-control-server/files/ud.html | 63 --- .../tasks/configure_imgmaker.yml | 4 +- .../video-control-server/templates/all.html | 58 +++ .../video-control-server/templates/aw.html | 55 +++ .../video-control-server/templates/cams.html | 52 +++ .../video-control-server/templates/h.html | 50 +++ .../video-control-server/templates/j.html | 53 +++ .../video-control-server/templates/k.html | 50 +++ .../video-control-server/templates/ua.html | 53 +++ .../video-control-server/templates/ud.html | 53 +++ 17 files changed, 426 insertions(+), 1034 deletions(-) delete mode 100644 ansible/playbooks/roles/video-control-server/files/all.html delete mode 100644 ansible/playbooks/roles/video-control-server/files/aw.html delete mode 100644 ansible/playbooks/roles/video-control-server/files/cams.html delete mode 100644 ansible/playbooks/roles/video-control-server/files/h.html delete mode 100644 ansible/playbooks/roles/video-control-server/files/j.html delete mode 100644 ansible/playbooks/roles/video-control-server/files/k.html delete mode 100644 ansible/playbooks/roles/video-control-server/files/ua.html delete mode 100644 ansible/playbooks/roles/video-control-server/files/ud.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/all.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/aw.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/cams.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/h.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/j.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/k.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/ua.html create mode 100644 ansible/playbooks/roles/video-control-server/templates/ud.html diff --git a/ansible/playbooks/roles/video-control-server/files/all.html b/ansible/playbooks/roles/video-control-server/files/all.html deleted file mode 100644 index c7abd96d..00000000 --- a/ansible/playbooks/roles/video-control-server/files/all.html +++ /dev/null @@ -1,397 +0,0 @@ - - - - Control.video.fosdem.org - overview of all streams - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- janson
- - - -
- - - - - - - 		- aw1120
- - - -
- - - - - - - 		- aw1121
- - - -
- - - - - - - 		- aw1125
- - - -
- - - - - - - 		- aw1126
- - - -
- - - - - - - 		- h1302
- - - -
- - - - - - - 		- h1308
- - - -
- - - - - - - 		- h1309
- - - -
- - - - - - - 		- h2213
- - - -
- - - - - - -
- h2214
- - - -
- - - - - - - 		- h2215
- - - -
- - - - - - - 		- k1105
- - - -
- - - - - - - 		- k3201
- - - -
- - - - - - - 		- k3401
- - - -
- - - - - - - 		- k4201
- - - -
- - - - - - - 		- k4401
- - - -
- - - - - - - 		- k4601
- - - -
- - - - - - - 		- ua2114
- - - -
- - - - - - - 		- ua2118
- - - -
- - - - - - -
- ua2220
- - - -
- - - - - - - 		- ub5132
- - - -
- - - - - - - 		- ub2252a
- - - -
- - - - - - - 		- ud2120
- - - -
- - - - - - - 		ud2119
- - - -
- - - - - - - 		- ud2208
- - - -
- - - - - - - 		- - ud2218a
- - - -
- - - - - - -
- - - - diff --git a/ansible/playbooks/roles/video-control-server/files/aw.html b/ansible/playbooks/roles/video-control-server/files/aw.html deleted file mode 100644 index 3a12d4eb..00000000 --- a/ansible/playbooks/roles/video-control-server/files/aw.html +++ /dev/null @@ -1,85 +0,0 @@ - - - - Control.video.fosdem.org - AW streams - - - - - - - - - - - - - - -
aw1120
- - - -
- - - - - - - 		- aw1121
- - - -
- - - - - - - 		- aw1125
- - - -
- - - - - - - 		- aw1126
- - - -
- - - - - - -
- - diff --git a/ansible/playbooks/roles/video-control-server/files/cams.html b/ansible/playbooks/roles/video-control-server/files/cams.html deleted file mode 100644 index bbd6da18..00000000 --- a/ansible/playbooks/roles/video-control-server/files/cams.html +++ /dev/null @@ -1,224 +0,0 @@ - - - - Config.video.fosdem.org - all cameras - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- janson
- - - -
- 		aw1120
- - - -
- 		- aw1121
- - - -
- 		- aw1125
- - - -
- 		- aw1126
- - - -
- 		- h1301
- - - -
- 		- h1302
- - - -
- 		- h1308
- - - -
- 		- h1309
- - - -
-
- h2213
- - - -
- 		- h2214
- - - -
- 		- h2215
- - - -
- 		- k1105
- - - -
- 		- k3201
- - - -
- 		- k3401
- - - -
- 		- k4201
- - - -
- 		- k4401
- - - -
- 		- k4601
- - - -
-
- ua2114
- - - -
- 		- ua2220
- - - -
- 		ud2119
- - - -
- 		- ub2252a
- - - -
- 		- ud2120
- - - -
- 		- ud2218a
- - - -
-
- - - - diff --git a/ansible/playbooks/roles/video-control-server/files/h.html b/ansible/playbooks/roles/video-control-server/files/h.html deleted file mode 100644 index c925501f..00000000 --- a/ansible/playbooks/roles/video-control-server/files/h.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - Control.video.fosdem.org - H Streams - - - - - - - - - - - - - - - - - - - - -
- h1301
-
- - - 		- h1302
-
- - - 		- h1308
-
- - - 		- h1309
-
- - - 		- h2213
-
- - - 		- h2214
-
- - - 		- h2215
-
- - -
- - - diff --git a/ansible/playbooks/roles/video-control-server/files/j.html b/ansible/playbooks/roles/video-control-server/files/j.html deleted file mode 100644 index 7e7546f6..00000000 --- a/ansible/playbooks/roles/video-control-server/files/j.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - Control.video.fosdem.org - Janson Streams - - - - - - - - - -
- janson
-
- - -
- - - - - - diff --git a/ansible/playbooks/roles/video-control-server/files/k.html b/ansible/playbooks/roles/video-control-server/files/k.html deleted file mode 100644 index cdcb8353..00000000 --- a/ansible/playbooks/roles/video-control-server/files/k.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - Control.video.fosdem.org - K Streams - - - - - - - - - - - - - - - - - - - -
- k1105
-
- - - 		- k3201
-
- - - 		- k3401
-
- - - 		- k4201
-
- - - 		- k4401
-
- - - 		- k4601
-
- - -
- - - diff --git a/ansible/playbooks/roles/video-control-server/files/ua.html b/ansible/playbooks/roles/video-control-server/files/ua.html deleted file mode 100644 index 02113962..00000000 --- a/ansible/playbooks/roles/video-control-server/files/ua.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - Control.video.fosdem.org - UA + UB Streams - - - - - - - - - - - - - - -
- ua2114
-
- - - 		- ua2118
-
- - - 		- ua2220
-
- - - 		- ub2252a
-
- - - 		- ub5132
-
- - -
- - - - - - diff --git a/ansible/playbooks/roles/video-control-server/files/ud.html b/ansible/playbooks/roles/video-control-server/files/ud.html deleted file mode 100644 index 29c249ae..00000000 --- a/ansible/playbooks/roles/video-control-server/files/ud.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - Control.video.fosdem.org - UD Streams - - - - - - - - - - - - - - - -
- ud2119
-
- - - 		- ud2120
-
- - - 		- ud2208
-
- - - 		- ud2218a
-
- - -
- - - - - - diff --git a/ansible/playbooks/roles/video-control-server/tasks/configure_imgmaker.yml b/ansible/playbooks/roles/video-control-server/tasks/configure_imgmaker.yml index 1ce6dba7..355f5032 100644 --- a/ansible/playbooks/roles/video-control-server/tasks/configure_imgmaker.yml +++ b/ansible/playbooks/roles/video-control-server/tasks/configure_imgmaker.yml @@ -37,9 +37,9 @@ mode: 0644 - name: install html views - copy: + template: src: "{{ item }}" - dest: /var/www/html/ + dest: /var/www/html/{{ item }} owner: root group: root mode: 0644 diff --git a/ansible/playbooks/roles/video-control-server/templates/all.html b/ansible/playbooks/roles/video-control-server/templates/all.html new file mode 100644 index 00000000..fba7d1f1 --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/all.html @@ -0,0 +1,58 @@ + + + + Control.video.fosdem.org - overview of all streams + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded == 'yes' %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
+ {{ room.name }}
+ + + +
+ + + + + + +
+ + + + diff --git a/ansible/playbooks/roles/video-control-server/templates/aw.html b/ansible/playbooks/roles/video-control-server/templates/aw.html new file mode 100644 index 00000000..edcaf340 --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/aw.html @@ -0,0 +1,55 @@ + + + + Control.video.fosdem.org - AW streams + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded == 'yes' && room.name[:2] == 'AW' %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
{{ room.name }}
+ + + +
+ + + + + + +
+ + diff --git a/ansible/playbooks/roles/video-control-server/templates/cams.html b/ansible/playbooks/roles/video-control-server/templates/cams.html new file mode 100644 index 00000000..a374063d --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/cams.html @@ -0,0 +1,52 @@ + + + + Config.video.fosdem.org - all cameras + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded == 'yes' %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
+ {{ room.name }}
+ + + +
+
+ + + + diff --git a/ansible/playbooks/roles/video-control-server/templates/h.html b/ansible/playbooks/roles/video-control-server/templates/h.html new file mode 100644 index 00000000..e6eb600d --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/h.html @@ -0,0 +1,50 @@ + + + + Control.video.fosdem.org - H Streams + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded == 'yes' && room.name[:1] == 'H' %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
+ {{ room.name }}
+
+ + +
+ + + diff --git a/ansible/playbooks/roles/video-control-server/templates/j.html b/ansible/playbooks/roles/video-control-server/templates/j.html new file mode 100644 index 00000000..5b3248a2 --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/j.html @@ -0,0 +1,53 @@ + + + + Control.video.fosdem.org - Janson Streams + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded = 'yes' && room.name[:2] == 'J' %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
+ {{ room.name }}
+
+ + +
+ + + + + + diff --git a/ansible/playbooks/roles/video-control-server/templates/k.html b/ansible/playbooks/roles/video-control-server/templates/k.html new file mode 100644 index 00000000..30145ae3 --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/k.html @@ -0,0 +1,50 @@ + + + + Control.video.fosdem.org - K Streams + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded == 'yes' && room.name[:1] == 'K' %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
+ {{ room.name }}
+
+ + +
+ + + diff --git a/ansible/playbooks/roles/video-control-server/templates/ua.html b/ansible/playbooks/roles/video-control-server/templates/ua.html new file mode 100644 index 00000000..32040cd9 --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/ua.html @@ -0,0 +1,53 @@ + + + + Control.video.fosdem.org - UA + UB Streams + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded == 'yes' && (room.name[:2] == 'UA' || room.name[:2] == 'UB') %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
+ {{ room.name }}
+
+ + +
+ + + + + + diff --git a/ansible/playbooks/roles/video-control-server/templates/ud.html b/ansible/playbooks/roles/video-control-server/templates/ud.html new file mode 100644 index 00000000..f1116f58 --- /dev/null +++ b/ansible/playbooks/roles/video-control-server/templates/ud.html @@ -0,0 +1,53 @@ + + + + Control.video.fosdem.org - UD Streams + + + + + + + +{% roomcount = 0 %} +{% for room in rooms %} +{% if room.recorded == 'yes' && room.name[:2] == 'UD' %} +{% roomcount++ %} + +{% if roomcount >= 10 %} +{% roomcount = 0 %} + + +{% endif %} +{% endif %} +{% endfor %} + +
+ {{ room.name }}
+
+ + +
+ + + + + + From c7764e9179d66e71cdcd15be3df21c016552cdc5 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Tue, 18 Feb 2020 17:39:55 +0200 Subject: [PATCH 3/5] Use templates to generate year-specific items --- ansible/playbooks/roles/encoder-common/templates/config.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/playbooks/roles/encoder-common/templates/config.j2 b/ansible/playbooks/roles/encoder-common/templates/config.j2 index d26cbedb..619cc36c 100644 --- a/ansible/playbooks/roles/encoder-common/templates/config.j2 +++ b/ansible/playbooks/roles/encoder-common/templates/config.j2 @@ -13,14 +13,14 @@ $email_from = 'noreply@fosdem.org'; # A filename of a Mojo::Template template to process, returning the email body. Required if notify_actions includes email. $notify_email_template = '/srv/sreview/assets/notify-email.ep'; -$notify_email_subject = "Your FOSDEM 2020 talk titled '<%== \$title %>'\\"; +$notify_email_subject = "Your {{ event.fullname }} talk titled '<%== \$title %>'\\"; $announce_email_template = '/srv/sreview/assets/announce-email.ep'; -$announce_email_subject = "RELEASED: Your FOSDEM 2020 talk titled '<%== \$title %>'\\"; +$announce_email_subject = "RELEASED: Your {{ event.fullname }} talk titled '<%== \$title %>'\\"; # The default event to handle in the webinterface. Ignored by all other parts of sreview. -$event = 'FOSDEM 2020'; +$event = '{{ event.fullname }}'; $extra_profiles = { FOSDEM => { From ab72bb05ecd23e31ec13672ec625c3e5cf9d4b88 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Tue, 18 Feb 2020 17:49:08 +0200 Subject: [PATCH 4/5] Install the email templates (and also create the other directories while at it) --- .../roles/encoder-storage/tasks/main.yml | 26 +++++++++ .../templates/announce-email.ep.j2 | 27 +++++++++ .../templates/notify-email.ep.j2 | 58 +++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 ansible/playbooks/roles/encoder-storage/templates/announce-email.ep.j2 create mode 100644 ansible/playbooks/roles/encoder-storage/templates/notify-email.ep.j2 diff --git a/ansible/playbooks/roles/encoder-storage/tasks/main.yml b/ansible/playbooks/roles/encoder-storage/tasks/main.yml index 22ec5645..faf70cc0 100644 --- a/ansible/playbooks/roles/encoder-storage/tasks/main.yml +++ b/ansible/playbooks/roles/encoder-storage/tasks/main.yml @@ -19,3 +19,29 @@ name: nfs-server state: restarted when: reviewstorage_nfs_exported.changed + +- name: "create assets directory" + file: + path: /srv/sreview/assets + state: directory + +- name: "create other directories" + file: + path: /srv/sreview/{{ item }} + state: directory + owner: 2000 + group: 2000 + with_items: + - storage + - output + +- name: "Create email templates" + template: + dest: /srv/sreview/assets/{{ item }} + src: "{{ item }}" + owner: root + group: root + mode: 0644 + with_items: + - announce_email.ep.j2 + - notify_email.ep.j2 diff --git a/ansible/playbooks/roles/encoder-storage/templates/announce-email.ep.j2 b/ansible/playbooks/roles/encoder-storage/templates/announce-email.ep.j2 new file mode 100644 index 00000000..732f941b --- /dev/null +++ b/ansible/playbooks/roles/encoder-storage/templates/announce-email.ep.j2 @@ -0,0 +1,27 @@ +Hi! + +This is to inform you that your talk at {{ event.fullname }}, with title + +<%== $title %> + +has been fully transcoded and uploaded to + +% my $room = $talk->room; +% $room =~ s/ \(.*//; +https://video.fosdem.org/{{ event.year }}/<%== $room . '/' . $talk->slug . ".mp4" %> +https://video.fosdem.org/{{ event.year }}/<%== $room . '/' . $talk->slug . ".webm" %> + +Please note however, that it will still take a while for our mirrors to +pick up the video; before that happens, you will not be able to watch +it. Mirror sync may take up to a couple of hours in the worst case. + +Additionally, your video will also be linked to from the schedule; +however, this too may take a while. + +Should you encounter any issues with your recording, you may contact us +via: + +email: video@fosdem.org +IRC: irc.freenode.net, #fosdem-video + +Thanks for your assistance, diff --git a/ansible/playbooks/roles/encoder-storage/templates/notify-email.ep.j2 b/ansible/playbooks/roles/encoder-storage/templates/notify-email.ep.j2 new file mode 100644 index 00000000..e0c72b52 --- /dev/null +++ b/ansible/playbooks/roles/encoder-storage/templates/notify-email.ep.j2 @@ -0,0 +1,58 @@ +Hi! + +This is to inform you that your talk at {{ event.fullname }}, with title + +<%== $title %> + +is now available for you to review. + +Please help us reviewing this talk, so that we can release it sooner. If +you don't do so, we will eventually get around to it ourselves, but that +might take a while. +% my $corrections = $talk->corrections; +% if (exists ($corrections->{serial})) { + +We note that this is not the first time you receive this email; this is +because the video has been reviewed a first time (possibly not by you -- +check the Cc list, above). For your information, the following +corrections were applied to this video: + +Review counter: <%== $corrections->{serial} %> +Start time offset: <%== $corrections->{offset_start} %> +Length adjust: <%== $corrections->{length_adj} %> +A/V sync correction: <%== $corrections->{offset_audio} %> +Audio channel selection: Channel <%== $corrections->{audio_channel} %> +% if (defined($talk->apology)) { + +Additionally, this talk has an apology note configured: + + "<%== $talk->apology %>" + +If the talk is released, the above note will be shown on a "We're sorry, +but we had some technical problems"-type interstitial slide between the +opening credits and the actual talk. + +Should you wish to see it changed, please contact the FOSDEM video team +(see below). +% } + +Don't worry if you don't understand what the above means. The review +system will have taken your input, and created a new preview video. +Please review it, and confirm it if all is well. +% } else { +We note that this talk may have been previously submitted without any +changes been made to it. This is unlikely to have worked very well, so +we reset the talk to the editing stage. +% } + +Should you encounter any issues with your recording, you may contact us +via: + +email: video@fosdem.org +IRC: irc.freenode.net, #fosdem-video + +To review, please go to the following URL: + +<%== $url %> + +Thanks for your assistance! From 30a2303f928409b39cf73be436baf47451df87d8 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Tue, 18 Feb 2020 18:02:03 +0200 Subject: [PATCH 5/5] Fix variable check --- ansible/playbooks/roles/video-control-server/templates/all.html | 2 +- ansible/playbooks/roles/video-control-server/templates/aw.html | 2 +- .../playbooks/roles/video-control-server/templates/cams.html | 2 +- ansible/playbooks/roles/video-control-server/templates/h.html | 2 +- ansible/playbooks/roles/video-control-server/templates/j.html | 2 +- ansible/playbooks/roles/video-control-server/templates/k.html | 2 +- ansible/playbooks/roles/video-control-server/templates/ua.html | 2 +- ansible/playbooks/roles/video-control-server/templates/ud.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ansible/playbooks/roles/video-control-server/templates/all.html b/ansible/playbooks/roles/video-control-server/templates/all.html index fba7d1f1..8114a9f7 100644 --- a/ansible/playbooks/roles/video-control-server/templates/all.html +++ b/ansible/playbooks/roles/video-control-server/templates/all.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded == 'yes' %} +{% if room.recorded %} {% roomcount++ %} {{ room.name }}
diff --git a/ansible/playbooks/roles/video-control-server/templates/aw.html b/ansible/playbooks/roles/video-control-server/templates/aw.html index edcaf340..022f080e 100644 --- a/ansible/playbooks/roles/video-control-server/templates/aw.html +++ b/ansible/playbooks/roles/video-control-server/templates/aw.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded == 'yes' && room.name[:2] == 'AW' %} +{% if room.recorded && room.name[:2] == 'AW' %} {% roomcount++ %} {{ room.name }}
diff --git a/ansible/playbooks/roles/video-control-server/templates/cams.html b/ansible/playbooks/roles/video-control-server/templates/cams.html index a374063d..850a454e 100644 --- a/ansible/playbooks/roles/video-control-server/templates/cams.html +++ b/ansible/playbooks/roles/video-control-server/templates/cams.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded == 'yes' %} +{% if room.recorded %} {% roomcount++ %} {{ room.name }}
diff --git a/ansible/playbooks/roles/video-control-server/templates/h.html b/ansible/playbooks/roles/video-control-server/templates/h.html index e6eb600d..f323b550 100644 --- a/ansible/playbooks/roles/video-control-server/templates/h.html +++ b/ansible/playbooks/roles/video-control-server/templates/h.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded == 'yes' && room.name[:1] == 'H' %} +{% if room.recorded && room.name[:1] == 'H' %} {% roomcount++ %} {{ room.name }}
diff --git a/ansible/playbooks/roles/video-control-server/templates/j.html b/ansible/playbooks/roles/video-control-server/templates/j.html index 5b3248a2..4c328ea6 100644 --- a/ansible/playbooks/roles/video-control-server/templates/j.html +++ b/ansible/playbooks/roles/video-control-server/templates/j.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded = 'yes' && room.name[:2] == 'J' %} +{% if room.recorded && room.name[:2] == 'J' %} {% roomcount++ %} {{ room.name }}
diff --git a/ansible/playbooks/roles/video-control-server/templates/k.html b/ansible/playbooks/roles/video-control-server/templates/k.html index 30145ae3..dce1ce20 100644 --- a/ansible/playbooks/roles/video-control-server/templates/k.html +++ b/ansible/playbooks/roles/video-control-server/templates/k.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded == 'yes' && room.name[:1] == 'K' %} +{% if room.recorded && room.name[:1] == 'K' %} {% roomcount++ %} {{ room.name }}
diff --git a/ansible/playbooks/roles/video-control-server/templates/ua.html b/ansible/playbooks/roles/video-control-server/templates/ua.html index 32040cd9..010f22cb 100644 --- a/ansible/playbooks/roles/video-control-server/templates/ua.html +++ b/ansible/playbooks/roles/video-control-server/templates/ua.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded == 'yes' && (room.name[:2] == 'UA' || room.name[:2] == 'UB') %} +{% if room.recorded && (room.name[:2] == 'UA' || room.name[:2] == 'UB') %} {% roomcount++ %} {{ room.name }}
diff --git a/ansible/playbooks/roles/video-control-server/templates/ud.html b/ansible/playbooks/roles/video-control-server/templates/ud.html index f1116f58..b0ad5963 100644 --- a/ansible/playbooks/roles/video-control-server/templates/ud.html +++ b/ansible/playbooks/roles/video-control-server/templates/ud.html @@ -28,7 +28,7 @@ {% roomcount = 0 %} {% for room in rooms %} -{% if room.recorded == 'yes' && room.name[:2] == 'UD' %} +{% if room.recorded && room.name[:2] == 'UD' %} {% roomcount++ %} {{ room.name }}