diff --git a/provision-contest/ansible/roles/base_packages/tasks/main.yml b/provision-contest/ansible/roles/base_packages/tasks/main.yml index 9be1abe8..23e3627e 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 @@ -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 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 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: "" 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; - } -}