From 56e5222cedb06ccf8642751638b8ea4086436c28 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 6 Aug 2024 08:02:46 +0200
Subject: [PATCH 1/5] Remove forgotten file

---
 .../roles/prometheus_target_web/files/nginx-status.conf   | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 provision-contest/ansible/roles/prometheus_target_web/files/nginx-status.conf

diff --git a/provision-contest/ansible/roles/prometheus_target_web/files/nginx-status.conf b/provision-contest/ansible/roles/prometheus_target_web/files/nginx-status.conf
deleted file mode 100644
index 24231188..00000000
--- a/provision-contest/ansible/roles/prometheus_target_web/files/nginx-status.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-server {
-       listen   8787;
-       server_name _default_;
-
-       location = /basic_status {
-               stub_status;
-       }
-}

From 1f630ff62bc9019f603e462f92b03c42a3bf60d1 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:04:38 +0200
Subject: [PATCH 2/5] The OS in the ICPC image has been upgraded

---
 provision-contest/ansible/roles/base_packages/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provision-contest/ansible/roles/base_packages/tasks/main.yml b/provision-contest/ansible/roles/base_packages/tasks/main.yml
index 9be1abe8..54fafc3c 100644
--- a/provision-contest/ansible/roles/base_packages/tasks/main.yml
+++ b/provision-contest/ansible/roles/base_packages/tasks/main.yml
@@ -12,7 +12,7 @@
       - sources.list
       - sources.list.d/mono.list
       - sources.list.d/vscode.list
-      - sources.list.d/pypy-ubuntu-ppa-buster.list
+      - sources.list.d/pypy-ubuntu-ppa-jammy.list
     notify: Run apt update
 
   - name: Add packages to hosts file

From b8ec5c32f8584b8c5ebed5cd6dfef3b93ab897d7 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:20:04 +0200
Subject: [PATCH 3/5] Add fixes for nginx and IPv6

---
 .../ansible/roles/icpc_fixes/tasks/main.yml   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/provision-contest/ansible/roles/icpc_fixes/tasks/main.yml b/provision-contest/ansible/roles/icpc_fixes/tasks/main.yml
index 29c37b21..28a9d7b6 100644
--- a/provision-contest/ansible/roles/icpc_fixes/tasks/main.yml
+++ b/provision-contest/ansible/roles/icpc_fixes/tasks/main.yml
@@ -12,3 +12,24 @@
 - name: Re-order PXEboot
   command: efibootmgr -o {{ EFI_ORDER }}
   when: EFI_ORDER is defined
+
+- name: IPv6 nginx fixes
+  block:
+    - name: Create nginx directory before installation
+      file:
+        path: /etc/{{ item }}
+        state: directory
+        mode: '0755'
+        group: root
+        owner: root
+      loop:
+        - nginx
+        - nginx/sites-enabled
+
+    - name: Create nginx default without IPv6 listener
+      copy:
+        dest: /etc/nginx/sites-enabled/default
+        mode: '0644'
+        group: root
+        owner: root
+        content: ""

From 71a98ceee7f68c569b554eb8a076f53bb258a959 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 6 Aug 2024 19:22:09 +0200
Subject: [PATCH 4/5] Use latest grafana

---
 provision-contest/ansible/roles/grafana/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provision-contest/ansible/roles/grafana/tasks/main.yml b/provision-contest/ansible/roles/grafana/tasks/main.yml
index 9e478a7c..704e41db 100644
--- a/provision-contest/ansible/roles/grafana/tasks/main.yml
+++ b/provision-contest/ansible/roles/grafana/tasks/main.yml
@@ -66,7 +66,7 @@
 - name: Install grafana
   when: not WF_RESTRICTED_NETWORK
   apt:
-    deb: https://dl.grafana.com/oss/release/grafana_10.4.1_amd64.deb
+    deb: https://dl.grafana.com/oss/release/grafana_11.1.3_amd64.deb
     state: present
   notify: Restart grafana
 

From 7f514d57b4ddfa58d932d8207259f738fcdbdd90 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 6 Aug 2024 21:49:33 +0200
Subject: [PATCH 5/5] Remove invalid cache for (ICPC) ISO

During the WFs updating once per hour (so once per debugging) should be
fine and make sure the machines stay in the same state if SysOps
upgrades a package.
---
 .../ansible/roles/base_packages/tasks/main.yml              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/provision-contest/ansible/roles/base_packages/tasks/main.yml b/provision-contest/ansible/roles/base_packages/tasks/main.yml
index 54fafc3c..23e3627e 100644
--- a/provision-contest/ansible/roles/base_packages/tasks/main.yml
+++ b/provision-contest/ansible/roles/base_packages/tasks/main.yml
@@ -40,6 +40,12 @@
   notify: Run apt update
   when: dpkg_architectures.stdout.find('i386') != -1
 
+- name: Update cache if this is our first run
+  apt:
+    upgrade: true
+    update_cache: true
+    cache_valid_time: 3600
+
 - name: Flush handlers
   meta: flush_handlers