Revert "php83: preliminary work"
All checks were successful
Ansible Lint |Total|New|Outstanding|Fixed|Trend |:-:|:-:|:-:|:-:|:-: |2628|4|2624|6|:+1: Reference build: <a href="https://jenkins.evolix.org/job/gitea/job/ansible-roles/job/unstable/380//ansiblelint">Evolix » ansible-roles » unstable #380</a>
gitea/ansible-roles/pipeline/head This commit looks good

This reverts commit 1259b88588.
This commit is contained in:
David Prevot 2023-10-27 14:33:12 +02:00
parent 953ca015c5
commit 331f4e8875
7 changed files with 0 additions and 31 deletions

View file

@ -15,7 +15,6 @@ nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi
nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php80/rootfs/etc/php/8.0/fpm/pool.d/
nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php81/rootfs/etc/php/8.1/fpm/pool.d/
nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php82/rootfs/etc/php/8.2/fpm/pool.d/
nagios ALL = NOPASSWD: /usr/local/lib/nagios/plugins/check_phpfpm_multi /var/lib/lxc/php83/rootfs/etc/php/8.3/fpm/pool.d/
nagios ALL = NOPASSWD: /usr/sbin/megaclisas-status --nagios
nagios ALL = NOPASSWD: /usr/lib/nagios/plugins/check_ipmi_sensor
nagios ALL = NOPASSWD: /sbin/dmsetup status --noflush

View file

@ -699,20 +699,6 @@ ServiceVersion: PHP-FPM 8.2 (multiphp)
EOT
fi
if lxc-ls | grep -q php83 ; then
cat <<EOT >> "${ldif_file}"
dn: ServiceName=php-fpm83,${computer_dn}
NagiosEnabled: TRUE
ipServiceProtocol: tcp
objectClass: EvoService
ServiceName: php-fpm83
ipServicePort: 443
ServiceType: web
ServiceVersion: PHP-FPM 8.3 (multiphp)
EOT
fi
fi
# END - LXC (multiphp)

View file

@ -22,7 +22,6 @@ lxc_php_container_releases:
php80: "bullseye"
php81: "bullseye"
php82: "bookworm"
php83: "bookworm"
lxc_php_services:
php56: 'php5-fpm.service'
@ -32,7 +31,6 @@ lxc_php_services:
php80: 'php8.0-fpm.service'
php81: 'php8.1-fpm.service'
php82: 'php8.2-fpm.service'
php83: 'php8.3-fpm.service'
apt_keyring_dir: "{{ ansible_distribution_major_version is version('12', '<') | ternary('/etc/apt/trusted.gpg.d', '/etc/apt/keyrings') }}"
apt_basics_components: "{{ (ansible_virtualization_role == 'host') | ternary('main contrib non-free', 'main') }}"

View file

@ -10,11 +10,6 @@
name: "{{ lxc_php_version }}"
container_command: "systemctl restart {{ lxc_php_services[lxc_php_version] }}"
- name: Reload php83-fpm
community.general.lxc_container:
name: "{{ lxc_php_version }}"
container_command: "systemctl reload php8.3-fpm"
- name: Reload php82-fpm
community.general.lxc_container:
name: "{{ lxc_php_version }}"

View file

@ -42,9 +42,6 @@
- ansible.builtin.import_tasks: "php82.yml"
when: lxc_php_version == "php82"
- ansible.builtin.import_tasks: "php83.yml"
when: lxc_php_version == "php83"
- ansible.builtin.import_tasks: "umask.yml"
- ansible.builtin.import_tasks: "misc.yml"

View file

@ -84,7 +84,6 @@ command[check_php-fpm74]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi
command[check_php-fpm80]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php80/rootfs/etc/php/8.0/fpm/pool.d/
command[check_php-fpm81]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php81/rootfs/etc/php/8.1/fpm/pool.d/
command[check_php-fpm82]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php82/rootfs/etc/php/8.2/fpm/pool.d/
command[check_php-fpm83]=sudo {{ nagios_plugins_directory }}/check_phpfpm_multi /var/lib/lxc/php83/rootfs/etc/php/8.3/fpm/pool.d/
command[check_ipmi_sensors]=sudo /usr/lib/nagios/plugins/check_ipmi_sensor
command[check_raid_status]=/usr/lib/nagios/plugins/check_raid
command[check_dhcp_pool]={{ nagios_plugins_directory }}/check_dhcp_pool

View file

@ -34,8 +34,3 @@
ansible.builtin.service:
name: php8.2-fpm
state: restarted
- name: restart php8.3-fpm
ansible.builtin.service:
name: php8.3-fpm
state: restarted