From 0051523e8cec8b1080e27b3d3b879fb15849324c Mon Sep 17 00:00:00 2001
From: Paul Lecuq <paul@paulbsd.com>
Date: Sat, 25 Sep 2021 16:05:07 +0200
Subject: [PATCH] updated php state

---
 states/php/defaults.yaml | 19 ++++++++++++++-----
 states/php/map.jinja     |  6 +++++-
 states/php/service.sls   |  3 ++-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/states/php/defaults.yaml b/states/php/defaults.yaml
index 0113472..d96b652 100644
--- a/states/php/defaults.yaml
+++ b/states/php/defaults.yaml
@@ -17,8 +17,21 @@ php:
     - php-xml
     - php-zip
   extensions:
+    - acpu
+    - curl
+    - exif
+    - gd
+    - json
+    - imagick
     - readline
-  config_file: /etc/php/7.3/fpm/php.ini
+    - xml
+    - zip
+  config_file: ''
+  service: ''
+  fpm:
+    config_file: ''
+    config: {}
+    socket: '/var/run/php/php-fpm.sock'
   config:
     PHP:
       engine: 'On'
@@ -126,7 +139,3 @@ php:
     ldap:
       ldap.max_links: '-1'
 
-  fpm:
-    config_file: '/etc/php/7.3/fpm/php-fpm.conf'
-    config: {}
-    socket: '/var/run/php/php7.3-fpm.sock'
diff --git a/states/php/map.jinja b/states/php/map.jinja
index 6dce858..290d962 100644
--- a/states/php/map.jinja
+++ b/states/php/map.jinja
@@ -2,4 +2,8 @@
 
 {%- set defaults = salt['grains.filter_by'](default_settings, default='php') -%}
 
-{%- set php = salt['pillar.get']('php', default=defaults, merge=True) -%}
\ No newline at end of file
+{%- set php = salt['pillar.get']('php', default=defaults, merge=True) -%}
+
+{%- do php.update({'config_file': '/etc/php/{}/fpm/php.ini'.format(php.version)}) -%}
+{%- do php.fpm.update({'config_file': '/etc/php/{}/fpm/php-fpm.conf'.format(php.version)}) -%}
+{%- do php.update({'service': 'php{}-fpm'.format(php.version)}) -%}
\ No newline at end of file
diff --git a/states/php/service.sls b/states/php/service.sls
index 3636a70..99d555e 100644
--- a/states/php/service.sls
+++ b/states/php/service.sls
@@ -1,6 +1,7 @@
 ---
+{%- from "php/map.jinja" import php with context %}
 php-fpm-service:
   service.running:
-    - name: php7.3-fpm
+    - name: {{ php.service }}
     - enable: true
     - reload: true