From 528ab01605dafe536701d3d64d36983c5a0ea038 Mon Sep 17 00:00:00 2001 From: Thom Toogood Date: Mon, 7 Dec 2015 12:07:26 +1100 Subject: [PATCH] Allow overriding php_fpm_daemon --- tasks/configure.yml | 5 +++++ vars/Debian.yml | 2 +- vars/RedHat.yml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tasks/configure.yml b/tasks/configure.yml index 4f2baee..5ba439f 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -40,6 +40,11 @@ when: php_opcache_enable notify: restart webserver +- name: Define php_fpm_daemon. + set_fact: + php_fpm_daemon: "{{ __php_fpm_daemon }}" + when: php_fpm_daemon is not defined + - name: Ensure php-fpm is started and enabled at boot (if configured). service: name: "{{ php_fpm_daemon }}" diff --git a/vars/Debian.yml b/vars/Debian.yml index 7875d6e..9fc1aa3 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -20,4 +20,4 @@ __php_extension_conf_path: "{{ __php_conf_path }}/conf.d" __php_apc_conf_filename: 20-apc.ini __php_opcache_conf_filename: 05-opcache.ini -php_fpm_daemon: php5-fpm +__php_fpm_daemon: php5-fpm diff --git a/vars/RedHat.yml b/vars/RedHat.yml index ca90523..7f8ea48 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -21,4 +21,4 @@ php_extension_conf_path: /etc/php.d __php_apc_conf_filename: apc.ini __php_opcache_conf_filename: opcache.ini -php_fpm_daemon: php-fpm +__php_fpm_daemon: php-fpm