Commit 47bad69b authored by nimrod's avatar nimrod
Browse files

Merge branch 'feature/cleaner_openbsd_pkg'

parents 99e81cdf 106d6c09
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -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
+0 −4
Original line number Diff line number Diff line
---
# 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