feat(ng): promote NG formula

php/adodb.sls

@@ -1,8 +1,3 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php
-
-php-adodb:
-  pkg.installed:
-    - name: {{ php.adodb_pkg }}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'adodb' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/ng/apache2/files/mod_php.conf.jinja → php/apache2/files/mod_php.conf.jinja

@@ -1,6 +1,7 @@
-{% from "php/ng/map.jinja" import php with context %}
-{% from "php/ng/map.jinja" import phpng_version with context %}
-{% set major = phpng_version.split('.')|first %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import php with context %}
+{%- from tplroot ~ "/map.jinja" import php_version with context %}
+{%- set major = php_version.split('.')|first %}
 
 LoadModule php{{ major }}_module /usr/local/libexec/{{ php.lookup.apache2.name }}/libphp{{ major }}.so
 

php/ng/apache2/ini.sls → php/apache2/ini.sls

@@ -1,6 +1,7 @@
 # Manages the main Apache2 ini file
-{% from "php/ng/map.jinja" import php with context %}
-{% from "php/ng/ini.jinja" import php_ini %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import php with context %}
+{%- from tplroot ~ "/ini.jinja" import php_ini %}
 
 {% set settings = php.ini.defaults %}
 {% do settings.update(php.apache2.ini.settings) %}

php/apache2/init.sls

@@ -0,0 +1,13 @@
+{%- if grains['os_family'] in ["Debian", "FreeBSD"] %}
+include:
+  - php.apache2.install
+{%- endif %} #END: os = Debian|FreeBSD
+{%- if grains['os_family'] == "Debian" %}
+  - php.apache2.ini
+
+extend:
+  php_apache2_ini:
+    file:
+      - require:
+        - sls: php.apache2.install
+{%- endif %} #END: os = debian

php/apache2/install.sls

@@ -0,0 +1,19 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import php with context %}
+
+{%- set state = 'apache2' %}
+{%- include tplroot ~ "/installed.jinja" %}
+
+{%- if grains['os_family'] == "FreeBSD" %}
+{{ php.lookup.apache2.module_config }}:
+  file.managed:
+    - source: salt://php/apache2/files/mod_php.conf.jinja
+    - template: jinja
+{%- if salt['pillar.get']('php:use_apache_formula', True) %}
+    - makedirs: true
+    - require_in:
+      - sls: apache
+    - watch_in:
+      - module: apache-restart
+{%- endif %} #END: use apache formula
+{%- endif %} #END: os = debian

php/apc.sls

@@ -1,8 +1,3 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php
-
-php-apc:
-  pkg.installed:
-    - name: {{ php.apc_pkg }}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'apc' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/apcu.sls

@@ -1,8 +1,3 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php
-
-php-apcu:
-  pkg.installed:
-    - name: {{ php.apcu_pkg }}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'apcu' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/auth-sasl.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'auth-sasl' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/bcmath.sls

@@ -1,8 +1,3 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php
-
-php-bcmath:
-  pkg.installed:
-    - name: {{ php.bcmath_pkg }}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'bcmath' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/bz2.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'bz2' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/cache-lite.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'cache-lite' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/cgi.sls

@@ -1,8 +1,3 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php
-
-php-cgi:
-  pkg.installed:
-    - name: {{ php.cgi_pkg }}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'cgi' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/cli/ini.sls

@@ -0,0 +1,16 @@
+# Manages the php cli main ini file
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import php with context %}
+{%- from tplroot ~ "/ini.jinja" import php_ini %}
+
+{%- set settings = php.ini.defaults %}
+{%- for key, value in php.cli.ini.settings.items() %}
+  {%- if settings[key] is defined %}
+    {%- do settings[key].update(value) %}
+  {%- else %}
+    {%- do settings.update({key: value}) %}
+  {%- endif %}
+{%- endfor %}
+
+php_cli_ini:
+  {{ php_ini(php.lookup.cli.ini, php.cli.ini.opts, settings) }}

php/ng/cli/init.sls → php/cli/init.sls

@@ -1,11 +1,11 @@
 # Installs php-cli and manages the associated php.ini
 
 include:
-  - php.ng.cli.install
-  - php.ng.cli.ini
+  - php.cli.install
+  - php.cli.ini
 
 extend:
   php_cli_ini:
     file:
       - require:
-        - sls: php.ng.cli.install
+        - sls: php.cli.install

php/cli/install.sls

@@ -0,0 +1,18 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'cli' %}
+{%- include tplroot ~ "/installed.jinja" %}
+
+{%- if salt['grains.get']('os_family') == "Debian" %}
+{%- set current_php = salt['alternatives.show_current']('php') %}
+{%- set php_version = salt['pillar.get']('php:version', '7.0')|string %}
+
+php_{{ php_version }}_link:
+  alternatives.set:
+    - name: php
+    - path: /usr/bin/php{{ php_version }}
+    - require_in:
+      - pkg: php_install_{{ state }}
+    - onlyif:
+      - which php
+      - test {{ current_php }} != $(which php{{ php_version }})
+{%- endif %}

php/composer.sls

@@ -1,21 +1,30 @@
-{%- from "php/map.jinja" import php with context %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{% from tplroot ~ "/map.jinja" import php with context %}
 
-{%- set install_file = php.local_bin + '/' + php.composer_bin %}
+{% set install_file = php.lookup.pkgs.local_bin + '/' + php.lookup.pkgs.composer_bin %}
 
-{%- if not salt['config.get']('sudo_user') %}
-  {%- set salt_user = salt['config.get']('user', 'root') %}
-{%- else %}
-  {%- set salt_user = salt['config.get']('sudo_user', 'root') %}
-{%- endif %}
+{% if not salt['config.get']('sudo_user') %}
+  {% set salt_user = salt['config.get']('user', 'root') %}
+{% else %}
+  {% set salt_user = salt['config.get']('sudo_user', 'root') %}
+{% endif %}
 
-{%- set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
+{% set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
 
 include:
   - php
+{% if grains['os_family'] == 'FreeBSD' %}
+  - php.filter
+  - php.hash
+  - php.json
+  - php.mbstring
+  - php.openssl
+  - php.phar
+{% endif %}
 
 get-composer:
   file.managed:
-    - name: {{ php.temp_dir }}/installer
+    - name: {{ php.lookup.pkgs.temp_dir }}/installer
     - mode: 0755
     - unless: test -f {{ install_file }}
     - source: https://getcomposer.org/installer
@@ -25,7 +34,7 @@ get-composer:
 
 install-composer:
   cmd.run:
-    - name: php {{ php.temp_dir }}/installer --filename={{ php.composer_bin }} --install-dir={{ php.local_bin }}
+    - name: php {{ php.lookup.pkgs.temp_dir }}/installer --filename={{ php.lookup.pkgs.composer_bin }} --install-dir={{ php.lookup.pkgs.local_bin }}
     - unless: test -f {{ install_file }}
     - env:
       - HOME: {{ salt_user_home }}
@@ -46,7 +55,7 @@ update-composer:
 {% else %}
     - unless: test $(date -d "60 days $({{ install_file }} --version | cut -d ' ' -f 4,5)" "+%s") -gt $(date "+%s")
 {% endif %}
-    - cwd: {{ php.local_bin }}
+    - cwd: {{ php.lookup.pkgs.local_bin }}
     - env:
       - HOME: {{ salt_user_home }}
     - require:

php/console-table.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'console-table' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/ctype.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'ctype' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/curl.sls

@@ -1,8 +1,3 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php
-
-php-curl:
-  pkg.installed:
-    - name: {{ php.curl_pkg }}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'curl' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/dba.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'dba' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/dev.sls

@@ -1,8 +1,3 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php
-
-php-dev:
-  pkg.installed:
-    - name: {{ php.dev_pkg }}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'dev' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/dom.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'dom' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/fileinfo.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'fileinfo' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/filter.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- set state = 'filter' %}
+{%- include tplroot ~ "/installed.jinja" %}

php/ng/fpm/config.sls → php/fpm/config.sls

@@ -1,6 +1,7 @@
 # Manages the php-fpm main ini file
-{% from 'php/ng/map.jinja' import php with context %}
-{% from "php/ng/ini.jinja" import php_ini %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import php with context %}
+{%- from tplroot ~ "/ini.jinja" import php_ini %}
 
 {% set ini_settings = php.ini.defaults %}
 {% for key, value in php.fpm.config.ini.settings.items() %}

php/ng/fpm/init.sls → php/fpm/init.sls

@@ -1,9 +1,9 @@
 # Meta-state to fully install php.fpm
 
 include:
-  - php.ng.fpm.config
-  - php.ng.fpm.service
-  - php.ng.fpm.pools
+  - php.fpm.config
+  - php.fpm.service
+  - php.fpm.pools
 
 extend:
   php_fpm_service:
@@ -12,7 +12,7 @@ extend:
         - file: php_fpm_ini_config
         - file: php_fpm_conf_config
       - require:
-        - sls: php.ng.fpm.config
+        - sls: php.fpm.config
   php_fpm_ini_config:
     file:
       - require:

php/fpm/install.sls

@@ -0,0 +1,3 @@
+{%- set tplroot = tpldir.split('/')[0] %}
+{% set state = 'fpm' %}
+{% include tplroot ~ "/installed.jinja" %}

php/ng/fpm/pools.sls → php/fpm/pools.sls

@@ -1,7 +1,8 @@
 # Manages the php-fpm pools config files
-{% from "php/ng/map.jinja" import php with context %}
-{% from "php/ng/macro.jinja" import sls_block %}
-{% from "php/ng/fpm/pools_config.sls" import pool_states with context %}
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import php with context %}
+{%- from tplroot ~ "/macro.jinja" import sls_block %}
+{%- from tplroot ~ "/fpm/pools_config.sls" import pool_states with context %}
 
 {% macro file_requisites(states) %}
       {%- for state in states %}
@@ -10,8 +11,8 @@
 {% endmacro %}
 
 include:
-  - php.ng.fpm.service
-  - php.ng.fpm.pools_config
+  - php.fpm.service
+  - php.fpm.pools_config
 
 {% if pool_states %}
 extend:

php/fpm/pools_config.sls

@@ -0,0 +1,38 @@
+# Manages the php-fpm pools config files
+{%- set tplroot = tpldir.split('/')[0] %}
+{%- from tplroot ~ "/map.jinja" import php with context %}
+{%- from tplroot ~ "/macro.jinja" import sls_block, serialize %}
+
+# Simple path concatenation.
+{%- macro path_join(file, root) -%}
+  {{ root ~ '/' ~ file }}
+{%- endmacro %}
+
+{%- set pool_states = [] %}
+
+{%- for pool, config in php.fpm.pools.items() %}
+{%- if pool == 'defaults' %}{% continue %}{% endif %}
+{%- for pkey, pvalues in config.get('settings', {}).items() %}
+{%- set pool_defaults = php.fpm.pools.get('defaults', {}).copy() %}
+  {%- do pool_defaults.update(pvalues) %}
+  {%- do pvalues.update(pool_defaults) %}
+{%- endfor %}
+{%- set state = 'php_fpm_pool_conf_' ~ loop.index0 %}
+{%- set fpath = path_join(config.get('filename', pool), php.lookup.fpm.pools) %}
+
+{{ state }}:
+{%- if config.enabled %}
+  file.managed:
+    {{ sls_block(config.get('opts', {})) }}
+    - name: {{ fpath }}
+    - source: salt://php/files/php.ini
+    - template: jinja
+    - context:
+        config: {{ serialize(config.get('settings', {})) }}
+{%- else %}
+  file.absent:
+    - name: {{ fpath }}
+{%- endif %}
+
+{%- do pool_states.append(state) %}
+{%- endfor %}