updated php state

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'

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) -%}
+{%- 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)}) -%}

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