diff --git a/evolinux-users/templates/sudoers.j2 b/evolinux-users/templates/sudoers.j2 index 60b5b782..0e8471bf 100644 --- a/evolinux-users/templates/sudoers.j2 +++ b/evolinux-users/templates/sudoers.j2 @@ -15,6 +15,7 @@ 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 diff --git a/generate-ldif/templates/generateldif.sh.j2 b/generate-ldif/templates/generateldif.sh.j2 index 7e35ff5a..75eedfb4 100755 --- a/generate-ldif/templates/generateldif.sh.j2 +++ b/generate-ldif/templates/generateldif.sh.j2 @@ -699,6 +699,20 @@ ServiceVersion: PHP-FPM 8.2 (multiphp) EOT fi +if lxc-ls | grep -q php83 ; then + cat <> "${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) diff --git a/lxc-php/defaults/main.yml b/lxc-php/defaults/main.yml index c0612f4e..7d5e6abf 100644 --- a/lxc-php/defaults/main.yml +++ b/lxc-php/defaults/main.yml @@ -22,6 +22,7 @@ lxc_php_container_releases: php80: "bullseye" php81: "bullseye" php82: "bookworm" + php83: "bookworm" lxc_php_services: php56: 'php5-fpm.service' @@ -31,6 +32,7 @@ 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') }}" diff --git a/lxc-php/handlers/main.yml b/lxc-php/handlers/main.yml index b703933b..c1f58f92 100644 --- a/lxc-php/handlers/main.yml +++ b/lxc-php/handlers/main.yml @@ -10,6 +10,11 @@ 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 }}" diff --git a/lxc-php/tasks/main.yml b/lxc-php/tasks/main.yml index 035bfe15..c27aca4a 100644 --- a/lxc-php/tasks/main.yml +++ b/lxc-php/tasks/main.yml @@ -42,6 +42,9 @@ - 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" diff --git a/nagios-nrpe/templates/evolix.cfg.j2 b/nagios-nrpe/templates/evolix.cfg.j2 index a7bcab7d..14b7f26a 100644 --- a/nagios-nrpe/templates/evolix.cfg.j2 +++ b/nagios-nrpe/templates/evolix.cfg.j2 @@ -84,6 +84,7 @@ 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 diff --git a/php/handlers/main.yml b/php/handlers/main.yml index b333fe9b..d2b96b99 100644 --- a/php/handlers/main.yml +++ b/php/handlers/main.yml @@ -34,3 +34,8 @@ ansible.builtin.service: name: php8.2-fpm state: restarted + +- name: restart php8.3-fpm + ansible.builtin.service: + name: php8.3-fpm + state: restarted