From 4eddc4bf548d9a8ab2e36d7f7e295d4bdb3c93e3 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 2 Dec 2019 13:08:55 -0600 Subject: [PATCH] Fixes #28: Remove support for ancient unsupported PHP versions 5.6, 7.0, and 7.1. --- tasks/main.yml | 6 ------ tasks/setup-Debian.yml | 7 ------- tasks/setup-RedHat.yml | 12 ------------ vars/Debian.yml | 3 --- 4 files changed, 28 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 29273e4..7820086 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -32,9 +32,3 @@ # Setup tasks. - include_tasks: "setup-{{ ansible_os_family }}.yml" - -- name: Set the correct XHProf package when PHP 5.6 is used. - set_fact: - xhprof_download_url: https://github.com/phacility/xhprof/archive/master.tar.gz - xhprof_download_folder_name: xhprof-master - when: php_version == '5.6' diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index c43f64d..dda60bb 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -7,13 +7,6 @@ apt_repository: repo='ppa:ondrej/php' when: ansible_distribution == "Ubuntu" -- name: Add repository for PHP 5 compatibility packages (Ubuntu). - apt_repository: repo='ppa:ondrej/php5-compat' - when: - - php_version == "5.6" - - ansible_distribution == "Ubuntu" - - ansible_distribution_release != "bionic" - # Debian-specific tasks. - name: Add dependencies for PHP versions (Debian). apt: diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 7d9ea05..30fa3db 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -1,16 +1,4 @@ --- -- name: Enable remi repo for PHP 5.6. - set_fact: php_enablerepo="remi,remi-php56" - when: php_version == "5.6" - -- name: Enable remi repo for PHP 7.0. - set_fact: php_enablerepo="remi,remi-php70" - when: php_version == "7.0" - -- name: Enable remi repo for PHP 7.1. - set_fact: php_enablerepo="remi,remi-php71" - when: php_version == "7.1" - - name: Enable remi repo for PHP 7.2. set_fact: php_enablerepo="remi,remi-php72" when: php_version == "7.2" diff --git a/vars/Debian.yml b/vars/Debian.yml index a1e76db..678b29c 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -39,8 +39,5 @@ __php_packages: - "php{{ php_version }}-yaml" php_versions_debian: - - php5.6-common - - php7.0-common - - php7.1-common - php7.2-common - php7.3-common