feat(ng): promote NG formula

Author: nb

docs/README.rst

@@ -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/adodb.sls

@@ -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/files/mod_php.conf.jinja renamed to php/apache2/files/mod_php.conf.jinja

@@ -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/ng/apache2/ini.sls renamed to php/apache2/ini.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/init.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/apache2/install.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/apc.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/apcu.sls

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

php/auth-sasl.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" %}