diff --git a/ansible/deploy-fastpath.yml b/ansible/deploy-fastpath.yml index b9a8e502..8795c8b7 100644 --- a/ansible/deploy-fastpath.yml +++ b/ansible/deploy-fastpath.yml @@ -6,6 +6,28 @@ - fastpath2.prod.ooni.io - reuploaderfastpath.prod.ooni.io become: true + vars: + nginx_install_method: official_repo + pre_tasks: + - name: Find any nginx.org apt source files left over from a previous nginxinc.nginx install + ansible.builtin.find: + paths: /etc/apt/sources.list.d + patterns: "*.list" + contains: "nginx\\.org/packages" + read_whole_file: true + register: _stale_nginx_apt_sources + tags: + - nginx + - packages + + - name: Remove stale nginx.org apt source files (avoids "Conflicting values set for option Signed-By") + ansible.builtin.file: + path: "{{ item.path }}" + state: absent + loop: "{{ _stale_nginx_apt_sources.files }}" + tags: + - nginx + - packages roles: - role: bootstrap - role: nginx diff --git a/ansible/host_vars/fastpath.prod.ooni.io/vars.yml b/ansible/host_vars/fastpath.prod.ooni.io/vars.yml index b2847e9d..986a62f6 100644 --- a/ansible/host_vars/fastpath.prod.ooni.io/vars.yml +++ b/ansible/host_vars/fastpath.prod.ooni.io/vars.yml @@ -4,4 +4,4 @@ bucket_name: "ooni-data-eu-fra" # COLLECTOR ID SHOULD BE DIFFERENT BETWEEN EACH FASTPATH INSTANCE collector_id: "1" env: "prod" -fastpath_image: "ooni/fastpath:20260908-c4d5a24d" +fastpath_image: "ooni/fastpath:20260921-ac774cb4" diff --git a/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml b/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml index 1be99841..26123dcc 100644 --- a/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml +++ b/ansible/host_vars/fastpath2.prod.ooni.io/vars.yml @@ -4,4 +4,4 @@ bucket_name: "ooni-data-eu-fra" # COLLECTOR ID SHOULD BE DIFFERENT BETWEEN EACH FASTPATH INSTANCE collector_id: "4" env: "prod" -fastpath_image: "ooni/fastpath:20260908-c4d5a24d" +fastpath_image: "ooni/fastpath:20260921-ac774cb4" diff --git a/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml b/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml index 430f3f49..eef14c04 100644 --- a/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml +++ b/ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml @@ -4,4 +4,4 @@ bucket_name: "ooni-data-eu-fra" # COLLECTOR ID SHOULD BE DIFFERENT BETWEEN EACH FASTPATH INSTANCE collector_id: "5" env: "prod" -fastpath_image: "ooni/fastpath:20260908-c4d5a24d" +fastpath_image: "ooni/fastpath:20260921-ac774cb4" diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml index dbb2c3fc..bd70a7cd 100644 --- a/ansible/roles/nginx/tasks/main.yml +++ b/ansible/roles/nginx/tasks/main.yml @@ -71,7 +71,7 @@ - name: Add the nginx.org apt repository ansible.builtin.apt_repository: - repo: "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/debian {{ ansible_distribution_release }} nginx" + repo: "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx" filename: nginx state: present