Skip to content

Commit 5c7cfb0

Browse files
alessfgalessfg
authored
Remove scalars where I don't need em (#323)
1 parent 903693e commit 5c7cfb0

File tree

6 files changed

+28
-37
lines changed

6 files changed

+28
-37
lines changed

‎tasks/amplify/install-amplify.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
- name: "Configure NGINX Amplify agent repository"
33
include_tasks: "{{ role_path }}/tasks/amplify/setup-{{ ansible_facts['os_family'] | lower }}.yml"
4-
when: ansible_facts['os_family'] == "Debian"
5-
or ansible_facts['os_family'] == "Redhat"
4+
when: ansible_facts['os_family'] in ['Debian', 'RedHat']
65

76
- name: "Install NGINX Amplify agent"
87
package:

‎tasks/amplify/setup-debian.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
- name: "(Debian/Ubuntu) Add NGINX Amplify agent repository"
33
apt_repository:
44
filename: nginx-amplify
5-
repo: >-
6-
deb [arch=amd64] https://packages.amplify.nginx.com/
7-
{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] | lower }} amplify-agent
5+
repo: "deb [arch=amd64] https://packages.amplify.nginx.com/{{ ansible_facts['distribution'] | lower }}/
6+
{{ ansible_facts['distribution_release'] | lower }} amplify-agent"
87
update_cache: yes
98
mode: 0644
109
when: ansible_facts['distribution_release'] != "focal"

‎tasks/config/cleanup-config.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@
1717
file:
1818
path: "{{ item }}"
1919
state: absent
20-
loop: >-
21-
{{ nginx_config_files.results | default('') | map(attribute='files') | sum(start=[]) | map(attribute='path') | list
22-
+ nginx_cleanup_config_files | default('') }}
20+
loop: "{{ nginx_config_files.results | default('') | map(attribute='files') | sum(start=[]) | map(attribute='path') | list
21+
+ nginx_cleanup_config_files | default('') }}"

‎tasks/opensource/install-source.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
url: "https://ftp.pcre.org/pub/pcre/{{ pcre_version }}.tar.gz"
131131
dest: "/tmp/{{ pcre_version }}.tar.gz"
132132
mode: 0600
133-
validate_certs: >-
134-
{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('no', 'yes') }}
133+
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
134+
| ternary('no', 'yes') }}"
135135
register: pcre_source
136136

137137
- name: "Unpack PCRE dependency"
@@ -189,8 +189,8 @@
189189
url: "https://zlib.net/{{ zlib_version }}.tar.gz"
190190
dest: "/tmp/{{ zlib_version }}.tar.gz"
191191
mode: 0600
192-
validate_certs: >-
193-
{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('no', 'yes') }}
192+
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
193+
| ternary('no', 'yes') }}"
194194
register: zlib_source
195195

196196
- name: "Unpack ZLib dependency"
@@ -248,8 +248,8 @@
248248
url: "https://www.openssl.org/source/{{ openssl_version }}.tar.gz"
249249
dest: "/tmp/{{ openssl_version }}.tar.gz"
250250
mode: 0600
251-
validate_certs: >-
252-
{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('no', 'yes') }}
251+
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
252+
| ternary('no', 'yes') }}"
253253
register: openssl_source
254254

255255
- name: "Unpack OpenSSL dependency"
@@ -282,8 +282,8 @@
282282
uri:
283283
url: https://trac.nginx.org/nginx/browser
284284
return_content: yes
285-
validate_certs: >-
286-
{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('no', 'yes') }}
285+
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
286+
| ternary('no', 'yes') }}"
287287
register: nginx_versions
288288

289289
- name: "Set NGINX mainline version"
@@ -322,8 +322,8 @@
322322
url: "https://nginx.org/download/{{ nginx_download_name }}.tar.gz"
323323
dest: "/tmp/{{ nginx_download_name }}.tar.gz"
324324
mode: 0600
325-
validate_certs: >-
326-
{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '==')) | ternary('no', 'yes') }}
325+
validate_certs: "{{ (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] is version('6', '=='))
326+
| ternary('no', 'yes') }}"
327327
register: nginx_source
328328

329329
- name: "Unpack NGINX"

‎tasks/plus/install-plus.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
- name: "Set NGINX Plus repository"
88
set_fact:
9-
repository: >-
10-
{{ nginx_repository |
11-
default(nginx_plus_default_repository[(ansible_facts['distribution'] == 'Amazon') | ternary('amazon', ansible_facts['os_family'] | lower)]) }}
9+
repository: "{{ nginx_repository |
10+
default(nginx_plus_default_repository[(ansible_facts['distribution'] == 'Amazon') | ternary('amazon', ansible_facts['os_family'] | lower)]) }}"
1211

1312
- name: "Install NGINX from repository"
1413
include_tasks: "{{ role_path }}/tasks/plus/install-{{ ansible_facts['os_family'] | lower }}.yml"

‎vars/main.yml‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,18 @@ nginx_default_signing_key:
1919

2020
# Default NGINX Open Source repositories
2121
nginx_default_repository:
22-
alpine: >-
23-
https://nginx.org/packages/{{ (nginx_branch == 'mainline')
24-
| ternary('mainline/', '') }}alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\.[0-9]+') }}/main
22+
alpine: "https://nginx.org/packages/{{ (nginx_branch == 'mainline')
23+
| ternary('mainline/', '') }}alpine/v{{ ansible_facts['distribution_version'] | regex_search('^[0-9]+\\.[0-9]+') }}/main"
2524
debian:
26-
- >-
27-
deb [arch=amd64] https://nginx.org/packages/{{ (nginx_branch == 'mainline')
28-
| ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx
29-
- >-
30-
deb-src https://nginx.org/packages/{{ (nginx_branch == 'mainline')
31-
| ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx
32-
redhat: >-
33-
https://nginx.org/packages/{{ (nginx_branch == 'mainline')
34-
| ternary('mainline/', '') }}{{ (ansible_facts['distribution'] == "CentOS")
35-
| ternary('centos', 'rhel') }}/{{ ansible_facts['distribution_major_version'] }}/$basearch/
36-
suse: >-
37-
https://nginx.org/packages/{{ (nginx_branch == 'mainline')
38-
| ternary('mainline/', '') }}sles/{{ ansible_facts['distribution_major_version'] }}
25+
- "deb [arch=amd64] https://nginx.org/packages/{{ (nginx_branch == 'mainline')
26+
| ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx"
27+
- "deb-src https://nginx.org/packages/{{ (nginx_branch == 'mainline')
28+
| ternary('mainline/', '') }}{{ ansible_facts['distribution'] | lower }}/ {{ ansible_facts['distribution_release'] }} nginx"
29+
redhat: "https://nginx.org/packages/{{ (nginx_branch == 'mainline')
30+
| ternary('mainline/', '') }}{{ (ansible_facts['distribution'] == 'CentOS')
31+
| ternary('centos', 'rhel') }}/{{ ansible_facts['distribution_major_version'] }}/$basearch/"
32+
suse: "https://nginx.org/packages/{{ (nginx_branch == 'mainline')
33+
| ternary('mainline/', '') }}sles/{{ ansible_facts['distribution_major_version'] }}"
3934

4035
# Default NGINX Plus repositories
4136
nginx_plus_default_repository:

0 commit comments

Comments
 (0)