From 11fb54e504b6cfa1795891acde3c3ab65d7d77c9 Mon Sep 17 00:00:00 2001
From: Wayne Gemmell <wayne@connect-mobile.co.za>
Date: Mon, 8 Jun 2020 22:17:08 +0200
Subject: [PATCH] Installs packages in focal.

---
 php/fpm/config.sls | 2 +-
 php/fpm/init.sls   | 2 ++
 php/map.jinja      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/php/fpm/config.sls b/php/fpm/config.sls
index bfede2f..5ae9c64 100644
--- a/php/fpm/config.sls
+++ b/php/fpm/config.sls
@@ -14,7 +14,7 @@
   {%- endif %}
 {%- endfor %}
 
-{%- set pillar_php_version = php.pillar_php_version %}
+{%- set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
 {%- if pillar_php_version is iterable and pillar_php_version is not string %}
   {%- for version in pillar_php_version %}
     {%- set conf_settings = odict(php.lookup.fpm.defaults) %}
diff --git a/php/fpm/init.sls b/php/fpm/init.sls
index 2572a8e..94bdefb 100644
--- a/php/fpm/init.sls
+++ b/php/fpm/init.sls
@@ -6,6 +6,8 @@ include:
   - php.fpm.pools
 
 extend:
+{%- set pillar_php_version = salt['pillar.get']('php:version', '7.0') %}
+
 {% if pillar_php_version is iterable and pillar_php_version is not string %}
   {% for version in pillar_php_version %}
 
diff --git a/php/map.jinja b/php/map.jinja
index 713846c..5bc4324 100644
--- a/php/map.jinja
+++ b/php/map.jinja
@@ -768,7 +768,7 @@
         {%- endif %}
     {%- else %}
         {%- if salt['grains.get']('osrelease')|string >= '18.04' %}
-            {%- merge = php, salt['pillar.get']('php', {
+            {%- set php = salt['pillar.get']('php', {
                 'lookup': salt['grains.filter_by']({
                     'Ubuntu': {
                         'pkgs': {