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

Check SAPI mods enabled / disabled arrays

parent 66a77305
No related branches found
No related tags found
1 merge request!1Merge Sury
Pipeline #20853 passed
Stage: lint
Hide whitespace changes
Inline Side-by-side
defaults/main.yml
+ 250
− 1
View file @ fc67b060
...@@ -6,7 +6,6 @@ php_versions: ...@@ -6,7 +6,6 @@ php_versions:
'8.1': '8.1':
state: present state: present
packages_absent: packages_absent:
- php8.1-apcu
- libapache2-mod-php8.1 - libapache2-mod-php8.1
- php8.1-phpdbg - php8.1-phpdbg
packages_present: packages_present:
...@@ -31,8 +30,84 @@ php_versions: ...@@ -31,8 +30,84 @@ php_versions:
state: absent state: absent
cli: cli:
state: present state: present
modules_disabled: []
modules_enabled:
- apcu
- bcmath
- bz2
- calendar
- ctype
- curl
- dom
- exif
- ffi
- fileinfo
- ftp
- gettext
- iconv
- imap
- intl
- ldap
- mbstring
- opcache
- pdo
- pdo_sqlite
- phar
- posix
- readline
- shmop
- simplexml
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tokenizer
- uploadprogress
- xml
- xmlreader
- xmlwriter
- xsl
fpm: fpm:
state: present state: present
modules_disabled: []
modules_enabled:
- apcu
- bcmath
- bz2
- calendar
- ctype
- curl
- dom
- exif
- ffi
- fileinfo
- ftp
- gettext
- iconv
- imap
- intl
- ldap
- mbstring
- opcache
- pdo
- pdo_sqlite
- phar
- posix
- readline
- shmop
- simplexml
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tokenizer
- uploadprogress
- xml
- xmlreader
- xmlwriter
- xsl
phpdbg: phpdbg:
state: absent state: absent
'8.0': '8.0':
...@@ -62,8 +137,82 @@ php_versions: ...@@ -62,8 +137,82 @@ php_versions:
state: absent state: absent
cli: cli:
state: present state: present
modules_disabled: []
modules_enabled:
- apcu
- bcmath
- bz2
- calendar
- ctype
- curl
- dom
- exif
- ffi
- fileinfo
- ftp
- gettext
- iconv
- imap
- intl
- ldap
- opcache
- pdo
- pdo_sqlite
- phar
- posix
- readline
- shmop
- simplexml
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tokenizer
- uploadprogress
- xml
- xmlreader
- xmlwriter
- xsl
fpm: fpm:
state: present state: present
modules_disabled: []
modules_enabled:
- apcu
- bcmath
- bz2
- calendar
- ctype
- curl
- dom
- exif
- ffi
- fileinfo
- ftp
- gettext
- iconv
- imap
- intl
- ldap
- opcache
- pdo
- pdo_sqlite
- phar
- posix
- readline
- shmop
- simplexml
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tokenizer
- uploadprogress
- xml
- xmlreader
- xmlwriter
- xsl
phpdbg: phpdbg:
state: absent state: absent
'7.4': '7.4':
...@@ -96,8 +245,108 @@ php_versions: ...@@ -96,8 +245,108 @@ php_versions:
state: absent state: absent
cli: cli:
state: present state: present
modules_disabled: []
modules_enabled:
- apcu
- apcu_bc
- bcmath
- bz2
- calendar
- ctype
- curl
- dom
- exif
- ffi
- fileinfo
- ftp
- gd
- geoip
- gettext
- gmp
- iconv
- imagick
- imap
- intl
- json
- ldap
- mbstring
- mysqli
- mysqlnd
- opcache
- pdo
- pdo_mysql
- pdo_sqlite
- phar
- posix
- readline
- shmop
- simplexml
- soap
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tokenizer
- uploadprogress
- xml
- xmlreader
- xmlrpc
- xmlwriter
- xsl
- zip
fpm: fpm:
state: present state: present
modules_disabled: []
modules_enabled:
- apcu
- apcu_bc
- bcmath
- bz2
- calendar
- ctype
- curl
- dom
- exif
- ffi
- fileinfo
- ftp
- gd
- geoip
- gettext
- gmp
- iconv
- imagick
- imap
- intl
- json
- ldap
- mbstring
- mysqli
- mysqlnd
- opcache
- pdo
- pdo_mysql
- pdo_sqlite
- phar
- posix
- readline
- shmop
- simplexml
- soap
- sockets
- sqlite3
- sysvmsg
- sysvsem
- sysvshm
- tokenizer
- uploadprogress
- xml
- xmlreader
- xmlrpc
- xmlwriter
- xsl
- zip
phpdbg: phpdbg:
state: absent state: absent
'7.3': '7.3':
......
tasks/checks.yml
+ 10
− 8
View file @ fc67b060
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
var: php_versions_proposed var: php_versions_proposed
verbosity: 2 verbosity: 2
- name: Check that for each proposed version of PHP there are not packages due to be absent and present at the same time - name: Check that for each proposed version of PHP there are not packages due to be present and absent at the same time
include_tasks: pkg_checks.yml include_tasks: pkg_checks.yml
loop: "{{ php_versions_proposed }}" loop: "{{ php_versions_proposed }}"
loop_control: loop_control:
...@@ -99,13 +99,15 @@ ...@@ -99,13 +99,15 @@
label: "{{ version }}" label: "{{ version }}"
when: ( php_versions_absent is defined ) and ( php_versions_absent != [] ) when: ( php_versions_absent is defined ) and ( php_versions_absent != [] )
# - name: Include SAPI checks for PHP proposed versions - name: Include SAPI checks for PHP proposed versions
# include_tasks: sapi_checks.yml include_tasks: sapi_checks.yml
# loop: "{{ php_versions_proposed }}" loop: "{{ php_versions_proposed }}"
# loop_control: loop_control:
# loop_var: version loop_var: version
# label: "{{ version }}" label: "{{ version }}"
# when: ( php_versions_proposed is defined ) and ( php_versions_proposed != [] ) when:
- ( php_versions[version].sapis is defined )
- ( php_versions_proposed is defined ) and ( php_versions_proposed != [] )
# - name: Debug fail # - name: Debug fail
# fail: # fail:
......
tasks/sapi_checks.yml
+ 10
− 75
View file @ fc67b060
...@@ -11,82 +11,17 @@ ...@@ -11,82 +11,17 @@
loop_control: loop_control:
loop_var: sapi loop_var: sapi
label: "{{ sapi.key }}" label: "{{ sapi.key }}"
when: php_versions[version].sapis is defined
# - name: "Include PHP {{ version }} SAPI state checks" - name: "Check that no SAPI modules are set to be enabled and disabled at the same time for PHP {{ version }}"
# include_tasks: sapi_state_checks.yml include_tasks: sapi_module_checks.yml
# loop: "{{ php_versions[version].sapis | dict2items }}" loop: "{{ php_versions[version].sapis | dict2items }}"
# loop_control: loop_control:
# loop_var: sapi loop_var: sapi
# label: "{{ sapi.key }}" label: "{{ sapi.key }}"
# when: when:
# - php_versions[version].sapis is defined - ( sapi.value.state is defined ) and ( sapi.value.state == "present" )
# - php_versions[version].sapis.sapi is defined - ( sapi.value.modules_enabled is defined ) and ( sapi.value.modules_enabled != [] )
# - php_versions[version].sapis.sapi.state is defined - ( sapi.value.modules_disabled is defined ) and ( sapi.value.modules_disabled != [] )
# - name: "Debug PHP {{ version }} SAPI state"
# debug:
# var: sapi.value.state
# verbosity: 2
# loop: "{{ php_versions[version].sapis | dict2items }}"
# loop_control:
# loop_var: sapi
# label: "{{ sapi.key }}"
# when:
# - php_versions[version].sapis is defined
# - php_versions[version].sapis.sapi is defined
# - php_versions[version].sapis.sapi.state is defined
# - name: "Check that no SAPI is set to be present when PHP {{ version }} is set to be removed"
# assert:
# that:
# - sapi.value.state != "present"
# loop: "{{ php_versions[version].sapis | dict2items }}"
# loop_control:
# loop_var: sapi
# label: "{{ sapi.key }}"
# when:
# - php_versions[version].sapis is defined
# - php_versions[version].sapis.sapi is defined
# - php_versions[version].sapis.sapi.state is defined
# - name: Fail
# fail:
# - name: "Debug existing SAPIs for PHP {{ version }}"
# debug:
# var: ansible_local.phpquery.versions[version].sapis
# verbosity: 3
# when: ansible_local.phpquery.versions[version].sapis is defined
# - name: "Set an array for the existing SAPIs for PHP {{ version }}"
# set_fact:
# php_existing_sapis: "{{ php_existing_sapis | default([]) }} + [ '{{ existing_sapi.key }}' ]"
# when:
# - ansible_local.phpquery.versions[version].sapis is defined
# - existing_sapi.value.state == "present"
# loop: "{{ ansible_local.phpquery.versions[version].sapis | dict2items }}"
# loop_control:
# loop_var: existing_sapi
# label: "{{ existing_sapi.key }}"
# - name: "Debug existing SAPIs for PHP {{ version }}"
# debug:
# var: php_existing_sapis
# - name: Generate an array of proposed PHP SAPIs
# set_fact:
# php_proposed_sapis: "{{ php_proposed_sapis | default([]) }} + [ '{{ proposed_sapi.key }}' ]"
# when: ( proposed_sapi.value.state is defined ) and ( proposed_sapi.value.state == "present" )
# loop: "{{ sapis }}"
# loop_control:
# loop_var: proposed_sapi
# label: "{{ proposed_sapi.key }}"
# - name: Debug proposed PHP SAPIs
# debug:
# var: php_proposed_sapis
# when: php_proposed_sapis is defined
tags: tags:
- php - php
......
tasks/sapi_module_checks.yml 0 → 100644
+ 19
− 0
View file @ fc67b060
---
- name: Check that no SAPI modules are set to be enabled and disabled at the same time
block:
- name: "Loop through the modules_enabled for SAPI {{ sapi.key }} for PHP {{ version }} to check that none are also set to be disabled"
assert:
that:
- mod not in sapi.value.modules_disabled
loop: "{{ sapi.value.modules_enabled }}"
loop_control:
loop_var: mod
label: "{{ mod }}"
when:
- ( sapi.value.modules_enabled is defined ) and ( sapi.value.modules_enabled != [] )
- ( sapi.value.modules_disabled is defined ) and ( sapi.value.modules_disabled != [] )
tags:
- 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