Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions ansible/deploy-fastpath.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ansible/host_vars/fastpath.prod.ooni.io/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion ansible/host_vars/fastpath2.prod.ooni.io/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion ansible/host_vars/reuploaderfastpath.prod.ooni.io/vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion ansible/roles/nginx/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading