feat(ng): promote NG formula

Author: sticky-note

docs/README.rst

@@ -1,9 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php.deprecated
-  - php
-
-php-adodb:
-  pkg.installed:
-    - name: {{ php.adodb_pkg }}
+{% set state = 'adodb' %}
+{% include "php/installed.jinja" %}

php/adodb.sls

@@ -1,6 +1,6 @@
-{% 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 %}
+{% from "php/map.jinja" import php with context %}
+{% from "php/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,12 +1,9 @@
 # Manages the main Apache2 ini file
-{% from "php/ng/map.jinja" import php with context %}
-{% from "php/ng/ini.jinja" import php_ini %}
+{% from "php/map.jinja" import php with context %}
+{% from "php/ini.jinja" import php_ini %}
 
 {% set settings = php.ini.defaults %}
 {% do settings.update(php.apache2.ini.settings) %}
 
-include:
-  - php.ng.deprecated
-
 php_apache2_ini:
   {{ php_ini(php.lookup.apache2.ini, php.apache2.ini.opts, settings) }}

php/ng/apache2/ini.sls renamed to php/apache2/ini.sls

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

php/ng/apache2/init.sls renamed to php/apache2/init.sls

@@ -1,17 +1,14 @@
-{% from "php/ng/map.jinja" import php with context %}
-
-include:
-  - php.ng.deprecated
+{% from "php/map.jinja" import php with context %}
 
 {% set state = 'apache2' %}
-{% include "php/ng/installed.jinja" %}
+{% include "php/installed.jinja" %}
 
 {% if grains['os_family'] == "FreeBSD" %}
 {{ php.lookup.apache2.module_config }}:
   file.managed:
-    - source: salt://php/ng/apache2/files/mod_php.conf.jinja
+    - source: salt://php/apache2/files/mod_php.conf.jinja
     - template: jinja
-{% if salt['pillar.get']('php:ng:use_apache_formula', True) %}
+{% if salt['pillar.get']('php:use_apache_formula', True) %}
     - makedirs: true
     - require_in:
       - sls: apache

php/ng/apache2/install.sls renamed to php/apache2/install.sls

@@ -1,9 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php.deprecated
-  - php
-
-php-apc:
-  pkg.installed:
-    - name: {{ php.apc_pkg }}
+{% set state = 'apc' %}
+{% include "php/installed.jinja" %}

php/apc.sls

@@ -1,9 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php.deprecated
-  - php
-
-php-apcu:
-  pkg.installed:
-    - name: {{ php.apcu_pkg }}
+{% set state = 'apcu' %}
+{% include "php/installed.jinja" %}

php/apcu.sls

@@ -0,0 +1,2 @@
+{% set state = 'auth-sasl' %}
+{% include "php/installed.jinja" %}

php/auth-sasl.sls

@@ -1,9 +1,2 @@
-{%- from "php/map.jinja" import php with context %}
-
-include:
-  - php.deprecated
-  - php
-
-php-bcmath:
-  pkg.installed:
-    - name: {{ php.bcmath_pkg }}
+{% set state = 'bcmath' %}
+{% include "php/installed.jinja" %}