diff --git a/docs/rolereference.rst b/docs/rolereference.rst index b241b657499729909891cde634e8e04289dc787b..4018bc22e6a53fcc9c9895b7b49e603d47b10ffa 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1701,6 +1701,7 @@ Distribution compatibility Role is compatible with the following distributions: - Debian 11 (Bullseye) +- Debian 12 (Bookworm) Examples diff --git a/roles/php_website/defaults/main.yml b/roles/php_website/defaults/main.yml index 3b9d577646ace35738efbcf7e92d813d2959e3d9..e8bfbfb57e3d4ea6b5b799f607fc216a3fd5030f 100644 --- a/roles/php_website/defaults/main.yml +++ b/roles/php_website/defaults/main.yml @@ -14,12 +14,15 @@ environment_indicator: null # Internal parameters. php_fpm_service_name_per_release: bullseye: "php7.4-fpm" + bookworm: "php8.2-fpm" php_fpm_binary_per_release: bullseye: "php-fpm7.4" + bookworm: "php-fpm8.2" php_fpm_pool_directory_per_release: bullseye: "/etc/php/7.4/fpm/pool.d" + bookworm: "/etc/php/8.2/fpm/pool.d" admin: "admin-{{ fqdn | replace('.', '_') }}" user: "web-{{ fqdn | replace('.', '_') }}" diff --git a/roles/php_website/meta/main.yml b/roles/php_website/meta/main.yml index 743dbcd0a59b463cb6d44921b05dd762e431b3e9..af6ede5ca655eab10413f51d3d537637cd3b598c 100644 --- a/roles/php_website/meta/main.yml +++ b/roles/php_website/meta/main.yml @@ -15,3 +15,4 @@ galaxy_info: - name: Debian versions: - 11 + - 12 diff --git a/roles/php_website/molecule/default/molecule.yml b/roles/php_website/molecule/default/molecule.yml index 711dd9cff71dba34b65cddf34b8b3659d033875b..19280a24bfcd55ca7f3c545367721db76df479b5 100644 --- a/roles/php_website/molecule/default/molecule.yml +++ b/roles/php_website/molecule/default/molecule.yml @@ -24,6 +24,16 @@ platforms: provider_raw_config_args: - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" + - name: php-website-bookworm + groups: + - parameters-mandatory + - parameters-optional + box: debian/bookworm64 + memory: 512 + cpus: 1 + provider_raw_config_args: + - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" + provisioner: name: ansible playbooks: diff --git a/roles/php_website/molecule/default/tests/conftest.py b/roles/php_website/molecule/default/tests/conftest.py index f4ef497f2b8953bd333b725ce698b3ab695f9354..f9c832b15a2dc1d2217188eb28942305a580bc59 100644 --- a/roles/php_website/molecule/default/tests/conftest.py +++ b/roles/php_website/molecule/default/tests/conftest.py @@ -12,6 +12,7 @@ def php_info(host): Currently supports: - Debian 11 (Bullseye) + - Debian 12 (Bookworm) Resulting information can be accessed through returned named tuple with the following properties: @@ -29,6 +30,8 @@ def php_info(host): if ansible_distribution_release == 'bullseye': info = PHPInfo(fpm_package='php-fpm', fpm_service='php7.4-fpm', fpm_pool_dir='/etc/php/7.4/fpm/pool.d', base_config_dir='/etc/php/7.4') + elif ansible_distribution_release == 'bookworm': + info = PHPInfo(fpm_package='php-fpm', fpm_service='php8.2-fpm', fpm_pool_dir='/etc/php/8.2/fpm/pool.d', base_config_dir='/etc/php/8.2') else: raise Exception('The php_info pytest fixture does not support Debian release: %s' % ansible_distribution_release)