Upstream/ansible-role-php
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-php.git synced 2024-11-28 12:45:16 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #361 from geerlingguy/357-two-php-versions

Browse Source 
Issue #357: Two versions of PHP are getting installed.
This commit is contained in:
Jeff Geerling 2022-02-02 14:50:15 -06:00 committed by GitHub
commit 46996b9817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/main.yml
View File

@ -1,5 +1,8 @@
--- ---
# Variable setup. # Variable setup.
- name: Include OS-specific variables.
include_vars: "{{ ansible_os_family }}.yml"
- name: Include distribution and version-specific vars. - name: Include distribution and version-specific vars.
include_vars: "{{ item }}" include_vars: "{{ item }}"
with_first_found: with_first_found:
@ -12,9 +15,6 @@
php_default_version_debian: "{{ __php_default_version_debian }}" php_default_version_debian: "{{ __php_default_version_debian }}"
when: php_default_version_debian is not defined and ansible_os_family == 'Debian' when: php_default_version_debian is not defined and ansible_os_family == 'Debian'
- name: Include OS-specific variables.
include_vars: "{{ ansible_os_family }}.yml"
- name: Define php_packages. - name: Define php_packages.
set_fact: set_fact:
php_packages: "{{ __php_packages | list }}" php_packages: "{{ __php_packages | list }}"

6
vars/Debian.yml
View File

@ -1,6 +1,5 @@
--- ---
__php_default_version_debian: "7.0" __php_default_version_debian: "7.0"
__php_packages: __php_packages:
- php{{ php_default_version_debian }}-common - php{{ php_default_version_debian }}-common
- php{{ php_default_version_debian }}-cli - php{{ php_default_version_debian }}-cli
@ -14,8 +13,9 @@ __php_packages:
- php{{ php_default_version_debian }}-opcache - php{{ php_default_version_debian }}-opcache
- php{{ php_default_version_debian }}-xml - php{{ php_default_version_debian }}-xml
- php{{ php_default_version_debian }}-mbstring - php{{ php_default_version_debian }}-mbstring
- php-sqlite3 - php{{ php_default_version_debian }}-apcu
- php-apcu - php{{ php_default_version_debian }}-sqlite3
__php_webserver_daemon: "apache2" __php_webserver_daemon: "apache2"
# Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode. # Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode.