diff --git a/defaults/main.yml b/defaults/main.yml index 55afbdd..8ccd65f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,7 +9,6 @@ php_apc_cache_by_default: "1" php_apc_shm_size: "96M" php_date_timezone: "America/Chicago" php_enable_webserver: true -php_webserver_daemon: "httpd" php_enable_php_fpm: false php_enable_apc: true diff --git a/tasks/main.yml b/tasks/main.yml index 9bffcb6..bdb975d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -7,6 +7,11 @@ php_packages: "{{ __php_packages | list }}" when: php_packages is not defined +- name: Define php_webserver_daemon. + set_fact: + php_webserver_daemon: "{{ __php_webserver_daemon | list }}" + when: php_webserver_daemon is not defined + - name: Ensure PHP packages are installed (RedHat). yum: name: "{{ item }}" diff --git a/vars/Debian.yml b/vars/Debian.yml index b30b32b..3bc271d 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -13,4 +13,4 @@ __php_packages: - php5-fpm - php5-gd - php-pear -php_webserver_daemon: "apache2" +__php_webserver_daemon: "apache2" diff --git a/vars/RedHat.yml b/vars/RedHat.yml index efd323e..571e1e6 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -18,4 +18,4 @@ __php_packages: - php-pecl-apc - php-xml - php-xmlrpc -php_webserver_daemon: "httpd" +__php_webserver_daemon: "httpd"