diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 822b02a4330d61a60af5547f9023a1041a5cb0ce..4546f31648e0ae69115d79e9fb6365bb1b55d141 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1668,7 +1668,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 9 (Stretch) - Debian 10 (Buster) diff --git a/roles/php_website/defaults/main.yml b/roles/php_website/defaults/main.yml index 06cdc595f15e05d252c5ffa7ac857a14592ddce9..634786460d97a6387b9379c36427e022ef4c6575 100644 --- a/roles/php_website/defaults/main.yml +++ b/roles/php_website/defaults/main.yml @@ -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('.', '_') }}" diff --git a/roles/php_website/meta/main.yml b/roles/php_website/meta/main.yml index b3a13833d411d69ba60397ef7e0bb2c631338256..7a67140a82c587b01214029a42169f82a69f05b0 100644 --- a/roles/php_website/meta/main.yml +++ b/roles/php_website/meta/main.yml @@ -14,5 +14,4 @@ galaxy_info: platforms: - name: Debian versions: - - 9 - 10 diff --git a/roles/php_website/molecule/default/molecule.yml b/roles/php_website/molecule/default/molecule.yml index 3701c7bde2216577d46daea60c846d481bb796db..56d6a92493d4e637858a6044852d8bd75f81f939 100644 --- a/roles/php_website/molecule/default/molecule.yml +++ b/roles/php_website/molecule/default/molecule.yml @@ -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 diff --git a/roles/php_website/molecule/default/prepare.yml b/roles/php_website/molecule/default/prepare.yml index 549818e3a16771d58505c7c7c8ef203f8d4af09f..8e6bf3dd17750b7d5fcb4e16eed0cb4007d142d0 100644 --- a/roles/php_website/molecule/default/prepare.yml +++ b/roles/php_website/molecule/default/prepare.yml @@ -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" diff --git a/roles/php_website/molecule/default/tests/test_parameters_mandatory.py b/roles/php_website/molecule/default/tests/test_parameters_mandatory.py index 3f091c8c6e560dd2a57b07288d8a8e667690a4e6..22fb8cdbb37ea9b8a0f5fd199a7f4b4596d7e271 100644 --- a/roles/php_website/molecule/default/tests/test_parameters_mandatory.py +++ b/roles/php_website/molecule/default/tests/test_parameters_mandatory.py @@ -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)