From e89a0666b8064227a9113647c83a71df405480f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bogdan=20R=C4=83dulescu?= <bogdan@nimblex.net>
Date: Thu, 6 Feb 2014 13:43:13 +0000
Subject: [PATCH] New modules: mbstring and xml

In RedHat, Fedora and CentOS mbstring and xml are not compiled by default in PHP
In Debian these are compiled by default so the generic php5 package was specified
---
 php/map.jinja    | 4 ++++
 php/mbstring.sls | 6 ++++++
 php/xml.sls      | 6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 php/mbstring.sls
 create mode 100644 php/xml.sls

diff --git a/php/map.jinja b/php/map.jinja
index cf81f5a..d37688c 100644
--- a/php/map.jinja
+++ b/php/map.jinja
@@ -5,12 +5,14 @@
         'curl_pkg': 'php5-curl',
         'fpm_pkg': 'php5-fpm',
         'gd_pkg': 'php5-gd',
+        'mbstring_pkg': 'php5',
         'mcrypt_pkg': 'php5-mcrypt',
         'memcache_pkg': 'php5-memcache',
         'memcached_pkg': 'php5-memcached',
         'mysql_pkg': 'php5-mysql',
         'pear_pkg': ' php-pear',
         'fpm_service': 'php5-fpm',
+        'xml_pkg': ' php5',
     },
     'RedHat': {
         'php_pkg': 'php',
@@ -18,11 +20,13 @@
         'curl_pkg': 'curl',
         'fpm_pkg': 'php-fpm',
         'gd_pkg': 'php-gd',
+        'mbstring_pkg': 'php-mbstring',
         'mcrypt_pkg': 'php-mcrypt',
         'memcache_pkg': 'php-pecl-memcache',
         'memcached_pkg': 'php-pecl-memcached',
         'mysql_pkg': 'php-mysql',
         'pear_pkg': ' php-pear',
         'fpm_service': 'php-fpm',
+        'xml_pkg': ' php-xml',
     },
 }, merge=salt['pillar.get']('php:lookup')) %}
diff --git a/php/mbstring.sls b/php/mbstring.sls
new file mode 100644
index 0000000..dbe75a6
--- /dev/null
+++ b/php/mbstring.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-mbstring:
+  pkg:
+    - installed
+    - name: {{ php.mbstring_pkg }}
diff --git a/php/xml.sls b/php/xml.sls
new file mode 100644
index 0000000..9c63a00
--- /dev/null
+++ b/php/xml.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-xml:
+  pkg:
+    - installed
+    - name: {{ php.xml_pkg }}