Skip to content
Snippets Groups Projects
Verified Commit 2bceca34 authored by Chris Croome's avatar Chris Croome
Browse files

ansible-lint updates

parent f33f4d6d
No related branches found
No related tags found
1 merge request!1Merge Sury
Pipeline #27011 passed
Stage: lint
Hide whitespace changes
Inline Side-by-side
tasks/file_edited.yml
+ 3
− 3
View file @ 2bceca34
......@@ -32,7 +32,7 @@
- name: Set a fact for the proposed PHP configuration file variables
ansible.builtin.set_fact:
php_conf_file_proposed_vars: "{{ php_config | ansible.builtin.json_query(php_conf_file_proposed_vars_json_query) }}"
php_conf_file_proposed_vars: "{{ php_config | community.general.json_query(php_conf_file_proposed_vars_json_query) }}"
vars:
php_conf_file_proposed_vars_json_query: "[?state=='present'].files[]|[?path=='{{ php_conf_file }}'].conf|[0]"
......@@ -50,8 +50,8 @@
ansible.builtin.set_fact:
php_conf_file_backup: "{{ php_conf_file | ansible.builtin.dirname }}/.{{ php_conf_file | ansible.builtin.basename }}.{{ ansible_date_time.iso8601_basic_short }}.bak"
php_conf_file_changed: false
php_conf_file_sapi: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | ansible.builtin.json_query('[4]') }}"
php_conf_file_version: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | ansible.builtin.json_query('[3]') }}"
php_conf_file_sapi: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | community.general.json_query('[4]') }}"
php_conf_file_version: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | community.general.json_query('[3]') }}"
- name: Debug the PHP configuration file backup path
ansible.builtin.debug:
......
tasks/file_section_edited.yml
+ 4
− 4
View file @ 2bceca34
......@@ -16,10 +16,10 @@
msg:
- "File: {{ php_conf_file }}"
- "Section: {{ php_conf_section.key }}"
- "Existing {{ php_conf_variable_pair.key }}: '{{ php_conf_file_existing_vars | ansible.builtin.json_query(php_conf_variable_json_query) }}'"
- "Existing {{ php_conf_variable_pair.key }}: '{{ php_conf_file_existing_vars | community.general.json_query(php_conf_variable_json_query) }}'"
- "Proposed {{ php_conf_variable_pair.key }}: '{{ php_conf_variable_pair.value }};"
verbosity: "{% if ansible_check_mode | bool %}0{% else %}1{% endif %}"
when: php_conf_variable_pair.value != php_conf_file_existing_vars | ansible.builtin.json_query(php_conf_variable_json_query)
when: php_conf_variable_pair.value != php_conf_file_existing_vars | community.general.json_query(php_conf_variable_json_query)
vars:
php_conf_variable_json_query: '"{{ php_conf_section.key }}"."{{ php_conf_variable_pair.key }}"'
loop: "{{ php_conf_section.value | ansible.builtin.dict2items }}"
......@@ -37,7 +37,7 @@
mode: 0644
owner: root
group: root
when: php_conf_variable_pair.value != php_conf_file_existing_vars | ansible.builtin.json_query(php_conf_variable_json_query)
when: php_conf_variable_pair.value != php_conf_file_existing_vars | community.general.json_query(php_conf_variable_json_query)
vars:
php_conf_variable_json_query: '"{{ php_conf_section.key }}"."{{ php_conf_variable_pair.key }}"'
php_conf_variable_regex: "^[;]{{ php_conf_variable_pair.key }}[ =]"
......@@ -56,7 +56,7 @@
mode: 0644
owner: root
group: root
when: php_conf_variable_pair.value != php_conf_file_existing_vars | ansible.builtin.json_query(php_conf_variable_json_query)
when: php_conf_variable_pair.value != php_conf_file_existing_vars | community.general.json_query(php_conf_variable_json_query)
vars:
php_conf_variable_json_query: '"{{ php_conf_section.key }}"."{{ php_conf_variable_pair.key }}"'
loop: "{{ php_conf_section.value | ansible.builtin.dict2items }}"
......
tasks/file_templated.yml
+ 3
− 3
View file @ 2bceca34
......@@ -14,9 +14,9 @@
- name: Set facts for the PHP configuration file
ansible.builtin.set_fact:
php_conf_file_backup: "{{ php_conf_file | ansible.builtin.dirname }}/.{{ php_conf_file | ansible.builtin.basename }}.{{ ansible_date_time.iso8601_basic_short }}.bak"
php_conf_file_proposed_vars: "{{ php_config | ansible.builtin.json_query(php_conf_file_proposed_vars_json_query) }}"
php_conf_file_sapi: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | ansible.builtin.json_query('[4]') }}"
php_conf_file_version: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | ansible.builtin.json_query('[3]') }}"
php_conf_file_proposed_vars: "{{ php_config | community.general.json_query(php_conf_file_proposed_vars_json_query) }}"
php_conf_file_sapi: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | community.general.json_query('[4]') }}"
php_conf_file_version: "{{ php_conf_file | ansible.builtin.split(php_file_path_separator) | community.general.json_query('[3]') }}"
vars:
php_conf_file_proposed_vars_json_query: "[?state=='present'].files[]|[?path=='{{ php_conf_file }}'].conf|[0]"
......
tasks/sapi.yml
+ 2
− 2
View file @ 2bceca34
......@@ -13,13 +13,13 @@
- name: Debug the PHP SAPI mods disabled
ansible.builtin.debug:
var: php_sapi.mode_disabled
var: php_sapi.mods_disabled
verbosity: "{% if ansible_check_mode | bool %}1{% else %}2{% endif %}"
when: php_sapi.mods_disabled is defined
- name: Debug the PHP SAPI modes enabled
ansible.builtin.debug:
var: php_sapi.mode_enabled
var: php_sapi.mods_enabled
verbosity: "{% if ansible_check_mode | bool %}1{% else %}2{% endif %}"
when: php_sapi.mods_enabled is defined
......
vars/main.yml
+ 15
− 15
View file @ 2bceca34
......@@ -16,22 +16,22 @@ php_file_path_separator: '/'
# PHP versions absent
# cat defaults/main.yml | yq -o=json | jp "php_versions[?state=='absent'].version"
php_ver_absent: "{{ php_versions | ansible.builtin.json_query('[?state==`absent`].version') | sort }}"
php_ver_absent_regex: "{{ php_versions | ansible.builtin.json_query('[?state==`absent`].version') | sort | map('regex_replace', '^', '^php') }}"
php_ver_absent: "{{ php_versions | community.general.json_query('[?state==`absent`].version') | sort }}"
php_ver_absent_regex: "{{ php_versions | community.general.json_query('[?state==`absent`].version') | sort | map('regex_replace', '^', '^php') }}"
php_ver_pkg_remove: []
# PHP versions present
# cat defaults/main.yml | yq -o=json | jp "php_versions[?state=='present'].version"
php_ver_present: "{{ php_versions | ansible.builtin.json_query('[?state==`present`].version') | sort }}"
php_ver_present: "{{ php_versions | community.general.json_query('[?state==`present`].version') | sort }}"
# PHP packages absent
# cat defaults/main.yml | yq -o=json | jp "php_versions[?state=='present'].pkg_absent[]" | sort -u
php_pkg_absent: "{{ php_versions | ansible.builtin.json_query('[?state==`present`].pkg_absent[]') | ansible.builtin.unique | sort }}"
php_pkg_absent: "{{ php_versions | community.general.json_query('[?state==`present`].pkg_absent[]') | ansible.builtin.unique | sort }}"
# PHP packages present
# cat defaults/main.yml | yq -o=json | jp "php_versions[?state=='present'].pkg_present[]" | sort -u
php_pkg_present: "{{ php_versions | ansible.builtin.json_query('[?state==`present`].pkg_present[]') | ansible.builtin.unique | sort }}"
php_pkg_present: "{{ php_versions | community.general.json_query('[?state==`present`].pkg_present[]') | ansible.builtin.unique | sort }}"
# The php_ver is ued as an internal loop variable
php_ver: null
......@@ -40,42 +40,42 @@ php_conf_file_paths_jmespath_query: "[?version=='{{ php_ver }}'].files[].path"
# PHP versions configuration absent
# cat defaults/main.yml | yq -o=json | jp "php_config[?state=='absent'].version"
php_conf_ver_absent: "{{ php_config | ansible.builtin.json_query('[?state==`absent`].version') | sort }}"
php_conf_ver_absent: "{{ php_config | community.general.json_query('[?state==`absent`].version') | sort }}"
# PHP versions configuration present
# cat defaults/main.yml | yq -o=json | jp "php_config[?state=='present'].version"
php_conf_ver_present: "{{ php_config | ansible.builtin.json_query('[?state==`present`].version') | sort }}"
php_conf_ver_present: "{{ php_config | community.general.json_query('[?state==`present`].version') | sort }}"
# PHP versions configuration directories absent
php_conf_dirs_absent: "{{ php_config | ansible.builtin.json_query('[?state==`absent`].version') | sort | map('regex_replace', '^', '/etc/php/') }}"
php_conf_dirs_absent: "{{ php_config | community.general.json_query('[?state==`absent`].version') | sort | map('regex_replace', '^', '/etc/php/') }}"
# PHP versions configuration directories present
# cat defaults/main.yml | yq -o=json | jp "php_config[?state=='present'].version"
php_conf_dirs_present: "{{ php_config | ansible.builtin.json_query('[?state==`present`].version') | sort | map('regex_replace', '^', '/etc/php/') }}"
php_conf_dirs_present: "{{ php_config | community.general.json_query('[?state==`present`].version') | sort | map('regex_replace', '^', '/etc/php/') }}"
# PHP versions present files absent
# cat defaults/main.yml | yq -o=json | jp "php_config[?state=='present'].files[]|[?state=='absent'].path"
php_conf_files_absent: "{{ php_config | ansible.builtin.json_query('[?state==`present`].files[]|[?state==`absent`].path') | sort }}"
php_conf_files_absent: "{{ php_config | community.general.json_query('[?state==`present`].files[]|[?state==`absent`].path') | sort }}"
# PHP versions present configuration files edited
# cat defaults/main.yml | yq -o=json | jp "php_config[?state=='present'].files[]|[?state=='edited'].path"
php_conf_files_edited: "{{ php_config | ansible.builtin.json_query('[?state==`present`].files[]|[?state==`edited`].path') | sort }}"
php_conf_files_edited: "{{ php_config | community.general.json_query('[?state==`present`].files[]|[?state==`edited`].path') | sort }}"
# PHP versions present configuration files present
# cat defaults/main.yml | yq -o=json | jp "php_config[?state=='present'].files[]|[?state=='present'].path"
php_conf_files_present: "{{ php_config | ansible.builtin.json_query('[?state==`present`].files[]|[?state==`present`].path') | sort }}"
php_conf_files_present: "{{ php_config | community.general.json_query('[?state==`present`].files[]|[?state==`present`].path') | sort }}"
# PHP versions present configuration files templated
# cat defaults/main.yml | yq -o=json | jp "php_config[?state=='present'].files[]|[?state=='templated'].path"
php_conf_files_templated: "{{ php_config | ansible.builtin.json_query('[?state==`present`].files[]|[?state==`templated`].path') | sort }}"
php_conf_files_templated: "{{ php_config | community.general.json_query('[?state==`present`].files[]|[?state==`templated`].path') | sort }}"
# PHP modules configuration absent
# cat defaults/main.yml | yq -o=json | jp "php_modules[?state=='absent'].version"
php_mods_ver_absent: "{{ php_modules | ansible.builtin.json_query('[?state==`absent`].version') | sort }}"
php_mods_ver_absent: "{{ php_modules | community.general.json_query('[?state==`absent`].version') | sort }}"
# PHP modules configuration present
# cat defaults/main.yml | yq -o=json | jp "php_modules[?state=='present'].version"
php_mods_ver_present: "{{ php_modules | ansible.builtin.json_query('[?state==`present`].version') | sort }}"
php_mods_ver_present: "{{ php_modules | community.general.json_query('[?state==`present`].version') | sort }}"
# GPG public key URL linked from
# https://packages.sury.org/php/
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Webarchitects | Forum | Status | SSH Fingerprints