diff --git a/meta/main.yml b/meta/main.yml index fb04c15..44ec3c8 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -3,7 +3,7 @@ dependencies: [] galaxy_info: author: geerlingguy - description: PHP for RedHat/CentOS/Debian/Ubuntu. + description: PHP for RedHat/CentOS/Fedora/Debian/Ubuntu. company: "Midwestern Mac, LLC" license: "license (BSD, MIT)" min_ansible_version: 2.0 @@ -12,6 +12,9 @@ galaxy_info: versions: - 6 - 7 + - name: Fedora + versions: + - all - name: Debian versions: - all diff --git a/tasks/install-from-source.yml b/tasks/install-from-source.yml index 83a52a3..1d0d985 100644 --- a/tasks/install-from-source.yml +++ b/tasks/install-from-source.yml @@ -1,6 +1,6 @@ --- - name: Ensure dependencies for building from source are installed (RedHat). - yum: "pkg={{ item }} state=installed" + package: "name={{ item }} state=installed" with_items: - autoconf - automake diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 6cfde8c..a51e1e7 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -1,6 +1,6 @@ --- - name: Ensure PHP packages are installed. - yum: + package: name: "{{ item }}" state: "{{ php_packages_state }}" enablerepo: "{{ php_enablerepo }}" diff --git a/tests/test-source.yml b/tests/test-source.yml index eafbf1f..4693ac5 100644 --- a/tests/test-source.yml +++ b/tests/test-source.yml @@ -11,7 +11,7 @@ pre_tasks: - name: Ensure build dependencies are installed (RedHat). - yum: name=which state=present + package: name=which state=present when: ansible_os_family == 'RedHat' roles: diff --git a/tests/test.yml b/tests/test.yml index 06929d4..472b781 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -11,7 +11,7 @@ when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04' - name: Ensure build dependencies are installed (RedHat). - yum: name=which state=present + package: name=which state=present when: ansible_os_family == 'RedHat' - name: Add repository for PHP 7. @@ -24,5 +24,5 @@ roles: - role: geerlingguy.repo-remi - when: ansible_os_family == 'RedHat' + when: ansible_os_family == 'RedHat' and ansible_distribution != 'Fedora' - role_under_test