Changeset - cc70e8ad7abd
[Not reviewed]
0 5 0
Branko Majic (branko) - 5 months ago 2023-12-01 16:47:36
branko@majic.rs
MAR-189: Added support for Debian 11 Bullseye to php_website role.
5 files changed with 16 insertions and 2 deletions:
0 comments (0 inline, 0 general)
docs/rolereference.rst
Show inline comments
 
@@ -1691,6 +1691,7 @@ Distribution compatibility
 
Role is compatible with the following distributions:
 

	
 
- Debian 10 (Buster)
 
- Debian 11 (Bullseye)
 

	
 

	
 
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:
 
  buster: "php7.3-fpm"
 
  bullseye: "php7.4-fpm"
 

	
 
php_fpm_binary_per_release:
 
  buster: "php-fpm7.3"
 
  bullseye: "php-fpm7.4"
 

	
 
php_fpm_pool_directory_per_release:
 
  buster: "/etc/php/7.3/fpm/pool.d"
 
  bullseye: "/etc/php/7.4/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:
 
        - 10
 
        - 11
roles/php_website/molecule/default/molecule.yml
Show inline comments
 
@@ -14,15 +14,22 @@ lint:
 

	
 
platforms:
 

	
 
  - name: php-website-buster64
 
  - name: php-website-buster
 
    groups:
 
      - parameters-mandatory
 
      - parameters-optional
 
      - buster
 
    box: debian/contrib-buster64
 
    memory: 512
 
    cpus: 1
 

	
 
  - name: php-website-bullseye
 
    groups:
 
      - parameters-mandatory
 
      - parameters-optional
 
    box: debian/bullseye64
 
    memory: 512
 
    cpus: 1
 

	
 
provisioner:
 
  name: ansible
 
  playbooks:
roles/php_website/molecule/default/tests/test_parameters_mandatory.py
Show inline comments
 
@@ -141,6 +141,8 @@ def test_php_fpm_configuration_file(host):
 

	
 
    if distribution_release == "buster":
 
        config_file_path = '/etc/php/7.3/fpm/pool.d/parameters-mandatory.conf'
 
    elif distribution_release == "bullseye":
 
        config_file_path = '/etc/php/7.4/fpm/pool.d/parameters-mandatory.conf'
 
    else:
 
        raise Exception("Tried running test on unsupported distribution: %s" % distribution_release)
 

	
0 comments (0 inline, 0 general)