Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use php-dev.ini file for any PHP version #274

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ This project try to follows [Semantic Versioning](http://semver.org/) since the

For migration information, you can always have a look at https://liip-drifter.readthedocs.io/en/latest/migrations.html.

## Unreleased

### Changed

- PHP role: add the custom php-dev.ini for all PHP versions and all OS

## [2.0.4] - 2019-07-08

### Changed
Expand Down
13 changes: 6 additions & 7 deletions provisioning/roles/php-apache/tasks/php7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
notify: restart apache
become: yes

#- name: Configure mod-php
# command: php5enmod {{ item }}
# with_items:
# - php-dev
# - xdebug
# notify: restart apache
# become: yes
- name: Configure mod-php
command: "{{ phpenmod }} {{ item }}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
command: "{{ phpenmod }} {{ item }}"
command: "{{ phpenmod }} php-dev"

And remove the with_items below.

with_items:
- php-dev
notify: restart apache
become: yes

- meta: flush_handlers
14 changes: 12 additions & 2 deletions provisioning/roles/php/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,18 @@
become: yes
when: database_type|default(false) == 'postgresql'

- include: not-debian-7.0.yml
when: not (php_version_installed is version_compare('7.0', '>=') and ansible_distribution == 'Debian')
- name: Place PHP configuration files in place.
template: src={{ item.src }} dest={{ item.dest }} owner=root group=root mode=644
become: yes
with_items:
- { src: php.ini.j2, dest: "{{ etc_php_path }}/mods-available/php-dev.ini" }

- name: Activate PHP configuration files
command: "{{phpenmod}} {{ item }}"
with_items:
- php-dev
- imagick
become: yes

- name: set php alternative to the correct path
alternatives: name=php path={{ alternatives_php_path }}
Expand Down
12 changes: 0 additions & 12 deletions provisioning/roles/php/tasks/not-debian-7.0.yml

This file was deleted.