Changeset - 12eceb5941eb
[Not reviewed]
0 6 0
Branko Majic (branko) - 9 months ago 2023-08-11 00:24:08
branko@majic.rs
MAR-181: Drop support for Debian 9 Stretch from php_website role:

- Keep the mail alias step - it is still relevant for Debian Buster.
6 files changed with 2 insertions and 18 deletions:
0 comments (0 inline, 0 general)
docs/rolereference.rst
Show inline comments
 
@@ -1668,7 +1668,6 @@ Distribution compatibility
 

	
 
Role is compatible with the following distributions:
 

	
 
- Debian 9 (Stretch)
 
- Debian 10 (Buster)
 

	
 

	
roles/php_website/defaults/main.yml
Show inline comments
 
@@ -13,15 +13,12 @@ environment_indicator: null
 

	
 
# Internal parameters.
 
php_fpm_service_name_per_release:
 
  stretch: "php7.0-fpm"
 
  buster: "php7.3-fpm"
 

	
 
php_fpm_binary_per_release:
 
  stretch: "php-fpm7.0"
 
  buster: "php-fpm7.3"
 

	
 
php_fpm_pool_directory_per_release:
 
  stretch: "/etc/php/7.0/fpm/pool.d"
 
  buster: "/etc/php/7.3/fpm/pool.d"
 

	
 
admin: "admin-{{ fqdn | replace('.', '_') }}"
roles/php_website/meta/main.yml
Show inline comments
 
@@ -14,5 +14,4 @@ galaxy_info:
 
  platforms:
 
    - name: Debian
 
      versions:
 
        - 9
 
        - 10
roles/php_website/molecule/default/molecule.yml
Show inline comments
 
@@ -14,15 +14,6 @@ lint:
 

	
 
platforms:
 

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

	
 
  - name: php-website-buster64
 
    groups:
 
      - parameters-mandatory
roles/php_website/molecule/default/prepare.yml
Show inline comments
 
@@ -91,7 +91,7 @@
 
      notify:
 
        - Restart Postfix
 

	
 
    - name: Direct all mails from the root account to vagrant (Stretch image does not do that by default)
 
    - name: Direct all mails from the root account to vagrant
 
      lineinfile:
 
        path: /etc/aliases
 
        regexp: "^root"
roles/php_website/molecule/default/tests/test_parameters_mandatory.py
Show inline comments
 
@@ -139,9 +139,7 @@ def test_php_fpm_configuration_file(host):
 

	
 
    distribution_release = host.ansible("setup")["ansible_facts"]["ansible_distribution_release"]
 

	
 
    if distribution_release == "stretch":
 
        config_file_path = '/etc/php/7.0/fpm/pool.d/parameters-mandatory.conf'
 
    elif distribution_release == "buster":
 
    if distribution_release == "buster":
 
        config_file_path = '/etc/php/7.3/fpm/pool.d/parameters-mandatory.conf'
 
    else:
 
        raise Exception("Tried running test on unsupported distribution: %s" % distribution_release)
0 comments (0 inline, 0 general)