Skip to content
Snippets Groups Projects
Commit 92713cb1 authored by Chris Croome's avatar Chris Croome
Browse files

typo fixed

parent 83c2ba68
No related branches found
No related tags found
1 merge request!1Merge Sury
Pipeline #20921 passed
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
assert: assert:
that: that:
- php_allow_local_infile is not defined - php_allow_local_infile is not defined
quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Check that variables are booleans - name: Check that variables are booleans
assert: assert:
...@@ -16,12 +17,14 @@ ...@@ -16,12 +17,14 @@
- php_opcache_enable | type_debug == "bool" - php_opcache_enable | type_debug == "bool"
- php_opcache_validate_permission | type_debug == "bool" - php_opcache_validate_permission | type_debug == "bool"
- php_opcache_validate_root | type_debug == "bool" - php_opcache_validate_root | type_debug == "bool"
quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Check that the distro is Debian Bookworm, Bullseye, Buster or Stretch or Ubuntu Jammy, Focal or Bionic - name: Check that the distro is Debian Bookworm, Bullseye, Buster or Stretch or Ubuntu Jammy, Focal or Bionic
assert: assert:
that: that:
- ansible_distribution_release is defined - ansible_distribution_release is defined
- ansible_distribution_release is regex("^stretch|buster|bullseye|bookworm|focal|bionic|jammy$") - ansible_distribution_release is regex("^stretch|buster|bullseye|bookworm|focal|bionic|jammy$")
quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
fail_msg: "The Linux distro {{ ansible_distribution }} {{ ansible_distribution_release }} is not supported by this role" fail_msg: "The Linux distro {{ ansible_distribution }} {{ ansible_distribution_release }} is not supported by this role"
- name: Generate an array of existing PHP versions - name: Generate an array of existing PHP versions
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
assert: assert:
that: that:
- pkg not in php_versions[version].packages_absent - pkg not in php_versions[version].packages_absent
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
fail_msg: "Package {{ pkg }} is set to be both present and absent at the same time for PHP {{ version }}" fail_msg: "Package {{ pkg }} is set to be both present and absent at the same time for PHP {{ version }}"
loop: "{{ php_versions[version].packages_present }}" loop: "{{ php_versions[version].packages_present }}"
loop_control: loop_control:
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
assert: assert:
that: that:
- php_pm is regex("^static|ondemand|dynamic$") - php_pm is regex("^static|ondemand|dynamic$")
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Ensure that pm.max_children is defined, numeric and is greater than 1 - name: Ensure that pm.max_children is defined, numeric and is greater than 1
assert: assert:
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
- php_pm_max_children is defined - php_pm_max_children is defined
- ( php_pm_max_children | string ) is regex("^[0-9]+$") - ( php_pm_max_children | string ) is regex("^[0-9]+$")
- ( php_pm_max_children | int ) >= 1 - ( php_pm_max_children | int ) >= 1
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Conditional pm dynamic pool checks - name: Conditional pm dynamic pool checks
block: block:
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
- ( php_pm_min_spare_servers | string ) is regex("^[0-9]+$") - ( php_pm_min_spare_servers | string ) is regex("^[0-9]+$")
- php_pm_max_spare_servers is defined - php_pm_max_spare_servers is defined
- ( php_pm_max_spare_servers | string ) is regex("^[0-9]+$") - ( php_pm_max_spare_servers | string ) is regex("^[0-9]+$")
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Ensure that pm.max_children, pm.start_servers, pm.min_spare_servers and pm.max_spare_servers are greater than or equal to 1 - name: Ensure that pm.max_children, pm.start_servers, pm.min_spare_servers and pm.max_spare_servers are greater than or equal to 1
assert: assert:
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
- php_pm_start_servers | int >= 1 - php_pm_start_servers | int >= 1
- php_pm_min_spare_servers | int >= 1 - php_pm_min_spare_servers | int >= 1
- php_pm_max_spare_servers | int >= 1 - php_pm_max_spare_servers | int >= 1
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Ensure that pm.max_children is greater than or equal to pm.start_servers, pm.min_spare_servers and pm.max_spare_servers - name: Ensure that pm.max_children is greater than or equal to pm.start_servers, pm.min_spare_servers and pm.max_spare_servers
assert: assert:
...@@ -56,20 +56,20 @@ ...@@ -56,20 +56,20 @@
- php_pm_max_children | int >= php_pm_start_servers | int - php_pm_max_children | int >= php_pm_start_servers | int
- php_pm_max_children | int >= php_pm_min_spare_servers | int - php_pm_max_children | int >= php_pm_min_spare_servers | int
- php_pm_max_children | int >= php_pm_max_spare_servers | int - php_pm_max_children | int >= php_pm_max_spare_servers | int
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Ensure that pm.start_servers is be greater than pm.min_spare_servers and less than or equal to pm.max_spare_servers - name: Ensure that pm.start_servers is be greater than pm.min_spare_servers and less than or equal to pm.max_spare_servers
assert: assert:
that: that:
- php_pm_start_servers | int >= php_pm_min_spare_servers | int - php_pm_start_servers | int >= php_pm_min_spare_servers | int
- php_pm_start_servers | int <= php_pm_max_spare_servers | int - php_pm_start_servers | int <= php_pm_max_spare_servers | int
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
- name: Ensure that pm.max_spare_servers is greater than pm.min_spare_servers - name: Ensure that pm.max_spare_servers is greater than pm.min_spare_servers
assert: assert:
that: that:
- php_pm_max_spare_servers | int >= php_pm_min_spare_servers | int - php_pm_max_spare_servers | int >= php_pm_min_spare_servers | int
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
when: php_pm == "dynamic" when: php_pm == "dynamic"
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
assert: assert:
that: that:
- sapi.value.state == "absent" - sapi.value.state == "absent"
quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
fail_msg: "SAPI {{ sapi.key }} is not set to be absent for PHP {{ version }}, yet PHP {{ version }} is set to be removed." fail_msg: "SAPI {{ sapi.key }} is not set to be absent for PHP {{ version }}, yet PHP {{ version }} is set to be removed."
loop: "{{ php_versions[version].sapis | dict2items }}" loop: "{{ php_versions[version].sapis | dict2items }}"
loop_control: loop_control:
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
assert: assert:
that: that:
- mod not in sapi.value.modules_disabled - mod not in sapi.value.modules_disabled
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
fail_msg: "The PHP module {{ mod }} appears to in both the modules_enabled and modules_disabled arrays for SAPI {{ sapi.key }} for PHP version {{ version }}" fail_msg: "The PHP module {{ mod }} appears to in both the modules_enabled and modules_disabled arrays for SAPI {{ sapi.key }} for PHP version {{ version }}"
loop: "{{ sapi.value.modules_enabled }}" loop: "{{ sapi.value.modules_enabled }}"
loop_control: loop_control:
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
assert: assert:
that: that:
- sapi.value.state == "absent" - sapi.value.state == "absent"
quite: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}" quiet: "{% if ansible_verbosity == 0 %}true{% else %}false{% endif %}"
fail_msg: "SAPI {{ sapi.key }} is not set to be absent for PHP {{ version }}, yet PHP {{ version }} is set to be removed." fail_msg: "SAPI {{ sapi.key }} is not set to be absent for PHP {{ version }}, yet PHP {{ version }} is set to be removed."
# loop: # loop:
# - apache2 # - apache2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment