diff --git a/tasks/main.yml b/tasks/main.yml index cf0b23910d96ef5527a63b1b30f0cb4985b99302..de2ec252a631aced5bff9b9d605aac97465d4fe3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -12,7 +12,6 @@ - ansible_os_family in php_fpm_pools_dir - ansible_os_family in php_fpm_user - ansible_distribution_release in ['precise', 'wheezy', 'jessie', 'trusty'] or ansible_distribution_version in ['6.0'] - - ansible_os_family != 'OpenBSD' or ansible_distribution_version in php_fpm_pkg_version - php_fpm_global_config is iterable - php_fpm_www_pool_config is iterable @@ -27,7 +26,7 @@ - name: pkg install when: ansible_pkg_mgr == 'openbsd_pkg' openbsd_pkg: - name: '{{ php_fpm_pkg_version[ansible_distribution_version] }}' + name: php-fastcgi%5.6 state: present - name: Create pools directory diff --git a/vars/main.yml b/vars/main.yml index 3a7af96be13aab1f42877ae984c0d6f0bf3fe04a..c2e7e45b5dc1a5513cad250c56676d3ab7c82228 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,10 +1,6 @@ --- # vars file for php-fpm -php_fpm_pkg_version: - '5.9': php-fastcgi-5.6.18 - '6.0': php-fastcgi-5.6.23p0 - php_fpm_service: OpenBSD: php56_fpm Debian: php5-fpm