Changeset - 00b76acdecc7
[Not reviewed]
0 3 0
Branko Majic (branko) - 20 days ago 2024-08-30 17:03:29
branko@majic.rs
MAR-239: Dropped support for Debian 11 Bullseye from the php_website role.
3 files changed with 1 insertions and 17 deletions:
0 comments (0 inline, 0 general)
roles/php_website/defaults/main.yml
Show inline comments
 
@@ -14,15 +14,12 @@ http_header_overrides: {}
 

	
 
# 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('.', '_') }}"
roles/php_website/molecule/default/molecule.yml
Show inline comments
 
@@ -14,16 +14,6 @@ lint:
 

	
 
platforms:
 

	
 
  - name: php-website-bullseye
 
    groups:
 
      - parameters-mandatory
 
      - parameters-optional
 
    box: debian/bullseye64
 
    memory: 512
 
    cpus: 1
 
    provider_raw_config_args:
 
      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
 

	
 
  - name: php-website-bookworm
 
    groups:
 
      - parameters-mandatory
roles/php_website/molecule/default/tests/conftest.py
Show inline comments
 
@@ -11,7 +11,6 @@ def php_info(host):
 

	
 
    Currently supports:
 

	
 
    - Debian 11 (Bullseye)
 
    - Debian 12 (Bookworm)
 

	
 
    Resulting information can be accessed through returned named tuple
 
@@ -28,9 +27,7 @@ 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':
 
    if 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)