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

@@ @@ -1698,12 +1698,13 @@ Parameters @@
 Distribution compatibility
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 Role is compatible with the following distributions:
 - Debian 11 (Bullseye)
 - Debian 12 (Bookworm)
 Examples
 ~~~~~~~~
 Here is an example configuration for setting-up two (base) PHP websites (for

roles/php_website/defaults/main.yml

➞

Show inline comments

@@ @@ -11,18 +11,21 @@ additional_fpm_config: {} @@
 website_mail_recipients: "root"
 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('.', '_') }}"
 home: "/var/www/{{ fqdn }}"
 php_fpm_pool_directory: "{{ php_fpm_pool_directory_per_release[ansible_distribution_release] }}"
 php_fpm_binary: "{{ php_fpm_binary_per_release[ansible_distribution_release] }}"

roles/php_website/meta/main.yml

➞

Show inline comments

@@ @@ -12,6 +12,7 @@ galaxy_info: @@
   license: BSD
   min_ansible_version: 2.9
   platforms:
     - name: Debian
       versions:
         - 11
         - 12

roles/php_website/molecule/default/molecule.yml

➞

Show inline comments

@@ @@ -21,12 +21,22 @@ platforms: @@
     box: debian/bullseye64
     memory: 512
     cpus: 1
     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:
     cleanup: cleanup.yml
   config_options:
     defaults:

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

➞

Show inline comments

@@ @@ -9,12 +9,13 @@ def php_info(host): @@
     Helper fixture used to define what the expected PHP-FPM details
     are (paths, package names etc) based on Debian release.
     Currently supports:
     - Debian 11 (Bullseye)
     - Debian 12 (Bookworm)
     Resulting information can be accessed through returned named tuple
     with the following properties:
     - fpm_package (name of the PHP-FPM package)
     - fpm_service (name of the PHP-FPM system service)
@@ @@ -26,10 +27,12 @@ def php_info(host): @@
     ansible_facts = host.ansible("setup")["ansible_facts"]
     ansible_distribution_release = ansible_facts['ansible_distribution_release']
     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)
     return info

0 comments (0 inline, 0 general)