Merge remote-tracking branch 'upstream/master' into feature-composer

php/ng/apache2/ini.sls

+# Manages the libapache2-mod-php5 main ini file
+{% from 'php/ng/map.jinja' import php with context %}
+{% from "php/ng/ini.jinja" import php_ini %}
+
+{% set settings = php.ini.defaults %}
+{% do settings.update(php.apache2.ini.settings) %}
+
+php_apache2_ini:
+  {{ php_ini(php.lookup.apache2.ini, php.apache2.ini.opts, settings) }}

php/ng/apache2/init.sls

+# Installs libapache2-mod-php5 package and manages the associated php.ini on os Debian
+{% if grains['os_family']=="Debian" %}
+
+include:
+  - php.ng.apache2.install
+  - php.ng.apache2.ini
+
+extend:
+  php_apache2_ini:
+    file:
+      - require:
+        - sls: php.ng.apache2.install
+
+{% endif %} #END: os = debian

php/ng/apache2/install.sls

+{% set state = 'apache2' %}
+{% include "php/ng/installed.jinja" %}

php/ng/map.jinja

                 'apc': 'php-apc',
                 'cgi': 'php5-cgi',
                 'cli': 'php5-cli',
+                'apache2': 'libapache2-mod-php5',
                 'curl': 'php5-curl',
                 'fpm': 'php5-fpm',
                 'gd': 'php5-gd',
             'cli': {
                 'ini': '/etc/php5/cli/php.ini',
             },
+            'apache2': {
+                'ini': '/etc/php5/apache2/php.ini',
+            },
         },
         'RedHat': {
             'pkgs': {
             'settings': {},
         }
     },
+    'apache2': {
+        'ini': {
+            'opts': {},
+            'settings': {},
+        }
+    },
     'ini': {
         'defaults': {
             'PHP': {