From bf1d0b8ef3166b98117679b23ffefffe91fc30a3 Mon Sep 17 00:00:00 2001 From: Robert Rettig Date: Sun, 23 Feb 2025 22:17:43 +0100 Subject: [PATCH 1/2] Update install-distribution.yml allow overriding the current non generic name pattern. e.g. to set "@nginx:1.24/common" --- tasks/opensource/install-distribution.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/opensource/install-distribution.yml b/tasks/opensource/install-distribution.yml index aabcd28f7..33b23f1f3 100644 --- a/tasks/opensource/install-distribution.yml +++ b/tasks/opensource/install-distribution.yml @@ -9,6 +9,6 @@ - name: "{{ nginx_setup | capitalize }} NGINX from the distribution's package repository" ansible.builtin.package: - name: nginx{{ nginx_version | default('') }} + name: "{{ nginx_distribution_package_name | default('nginx' + (nginx_version | default(''))) }}" state: "{{ nginx_state }}" notify: (Handler) Run NGINX From 89d6c485b7dc3b1c213e5baf661f9abeebdc9d86 Mon Sep 17 00:00:00 2001 From: Robert Rettig Date: Sun, 23 Feb 2025 22:40:56 +0100 Subject: [PATCH 2/2] Update install-distribution.yml fix "can only concatenate str" --- tasks/opensource/install-distribution.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/opensource/install-distribution.yml b/tasks/opensource/install-distribution.yml index 33b23f1f3..b061b20eb 100644 --- a/tasks/opensource/install-distribution.yml +++ b/tasks/opensource/install-distribution.yml @@ -9,6 +9,6 @@ - name: "{{ nginx_setup | capitalize }} NGINX from the distribution's package repository" ansible.builtin.package: - name: "{{ nginx_distribution_package_name | default('nginx' + (nginx_version | default(''))) }}" + name: "{{ nginx_distribution_package_name | default('nginx' + (nginx_version | default('') | string)) }}" state: "{{ nginx_state }}" notify: (Handler) Run NGINX