majic-ansible-roles Changeset

Changeset - 9e06b8437eeb

Parent rev.

Child rev.

[Not reviewed]

0 5 0

Branko Majic (branko) - 2 months ago 2024-02-28 00:50:29
branko@majic.rs

MAR-192: Added support for Debian 12 Bookworm to php_website role.

5 files changed with 18 insertions and 0 deletions:

docs/rolereference.rst

roles/php_website/defaults/main.yml

roles/php_website/meta/main.yml

roles/php_website/molecule/default/molecule.yml

roles/php_website/molecule/default/tests/conftest.py

0 comments (0 inline, 0 general)

docs/rolereference.rst

➞

Show inline comments

@@ @@ -1701,6 +1701,7 @@ Distribution compatibility @@
 Role is compatible with the following distributions:
 - Debian 11 (Bullseye)
 - Debian 12 (Bookworm)
 Examples

roles/php_website/defaults/main.yml

➞

Show inline comments

@@ @@ -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('.', '_') }}"

roles/php_website/meta/main.yml

➞

Show inline comments

@@ @@ -15,3 +15,4 @@ galaxy_info: @@
     - name: Debian
       versions:
         - 11
         - 12

roles/php_website/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -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:

roles/php_website/molecule/default/tests/conftest.py

➞

Show inline comments

@@ @@ -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)

0 comments (0 inline, 0 general)