From 106d6c097cc1b873d20cd0e34e1e2dbbb380c2a0 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 6 Jul 2017 17:31:25 +0300
Subject: [PATCH] - A little cleaner OpenBSD package installation.
---
tasks/main.yml | 3 +--
vars/main.yml | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index cf0b239..de2ec25 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 3a7af96..c2e7e45 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
--
GitLab