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

Issue #17: Fix for proper configuration paths in Debian/Ubuntu for apache2.

Browse Source
This commit is contained in:
Jeff Geerling 2015-02-26 14:31:11 -06:00
parent d3e2ac586f
commit 6b5693fd73
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/main.yml
View File

@ -18,11 +18,6 @@
php_conf_path: "{{ __php_conf_path }}" php_conf_path: "{{ __php_conf_path }}"
when: php_conf_path is not defined when: php_conf_path is not defined
- name: Define php_extension_conf_path.
set_fact:
php_extension_conf_path: "{{ __php_extension_conf_path }}"
when: php_extension_conf_path is not defined
# Setup/install tasks. # Setup/install tasks.
- include: setup-RedHat.yml - include: setup-RedHat.yml
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'

2
vars/Debian.yml
View File

@ -14,7 +14,7 @@ __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.
__php_conf_path: "{{ '/etc/php5' if php_webserver_daemon and php_webserver_daemon != 'apache2' else '/etc/php5/apache2' }}" __php_conf_path: "{{ '/etc/php5' if php_webserver_daemon and php_webserver_daemon != 'apache2' else '/etc/php5/apache2' }}"
__php_extension_conf_path: "{{ __php_conf_path }}/conf.d" php_extension_conf_path: "/etc/php5/conf.d"
php_apc_conf_filename: 20-apc.ini php_apc_conf_filename: 20-apc.ini
php_fpm_daemon: php5-fpm php_fpm_daemon: php5-fpm

2
vars/RedHat.yml
View File

@ -18,7 +18,7 @@ __php_packages:
__php_webserver_daemon: "httpd" __php_webserver_daemon: "httpd"
__php_conf_path: /etc __php_conf_path: /etc
__php_extension_conf_path: /etc/php.d php_extension_conf_path: /etc/php.d
php_apc_conf_filename: apc.ini php_apc_conf_filename: apc.ini
php_fpm_daemon: php-fpm php_fpm_daemon: php-fpm