diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 106ce17..121a29e 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -10,11 +10,6 @@ php_enablerepo: "remi,remi-php82" php_install_recommends: false - handlers: - - name: update apt cache - apt: update_cache=true - when: ansible_os_family == 'Debian' - pre_tasks: - name: Update apt cache. apt: @@ -23,44 +18,6 @@ when: ansible_os_family == 'Debian' changed_when: false - - name: Ensure dirmngr is installed (gnupg dependency). - apt: - name: dirmngr - state: present - when: ansible_os_family == 'Debian' - - # Debian-specific tasks. - - name: Add dependencies for PHP versions (Debian). - apt: - name: - - apt-transport-https - - ca-certificates - - gnupg2 - state: present - when: ansible_distribution == "Debian" - - - name: Add Ondrej Sury's repo for PHP 8 (Ubuntu). - apt_repository: - repo: 'ppa:ondrej/php' - when: - - ansible_distribution == 'Ubuntu' - - ansible_distribution_major_version <= 22 - - - name: Add Ondrej Sury's apt key (Debian). - apt_key: - url: https://packages.sury.org/php/apt.gpg - state: present - when: ansible_distribution == "Debian" - - - name: Add Ondrej Sury's repo (Debian). - apt_repository: - repo: "deb https://packages.sury.org/php/ {{ ansible_distribution_release }} main" - state: present - when: ansible_distribution == "Debian" - notify: update apt cache - - - meta: flush_handlers - roles: - role: geerlingguy.repo-remi when: diff --git a/vars/Debian-10.yml b/vars/Debian-10.yml deleted file mode 100644 index ec895ae..0000000 --- a/vars/Debian-10.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -__php_default_version_debian: "7.3" diff --git a/vars/Debian.yml b/vars/Debian.yml index d03d1f9..91b2715 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,5 +1,5 @@ --- -__php_default_version_debian: "7.0" +__php_default_version_debian: "8.2" __php_packages: - php{{ php_default_version_debian }}-common - php{{ php_default_version_debian }}-cli diff --git a/vars/Ubuntu-18.yml b/vars/Ubuntu-18.yml deleted file mode 100644 index 82230bc..0000000 --- a/vars/Ubuntu-18.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -__php_default_version_debian: "7.2"