From 9b4b2ad8ef2e0c246cc78a09c7aa8c65fca4e6fe Mon Sep 17 00:00:00 2001
From: Fintan MacMahon <fintan.macmahon@gmail.com>
Date: Fri, 14 Feb 2014 13:38:20 +0000
Subject: [PATCH 1/3] Added additional modules.

---
 php/adodb.sls   |  6 ++++++
 php/imagick.sls |  6 ++++++
 php/imap.sls    |  6 ++++++
 php/ldap.sls    |  6 ++++++
 php/map.jinja   | 14 +++++++++++++-
 php/pgsql.sls   |  6 ++++++
 php/suhosin.sls |  6 ++++++
 7 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 php/adodb.sls
 create mode 100644 php/imagick.sls
 create mode 100644 php/imap.sls
 create mode 100644 php/ldap.sls
 create mode 100644 php/pgsql.sls
 create mode 100644 php/suhosin.sls

diff --git a/php/adodb.sls b/php/adodb.sls
new file mode 100644
index 0000000..77cf980
--- /dev/null
+++ b/php/adodb.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-adodb:
+  pkg:
+    - installed
+    - name: {{ php.adodb_pkg }}
diff --git a/php/imagick.sls b/php/imagick.sls
new file mode 100644
index 0000000..2274574
--- /dev/null
+++ b/php/imagick.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-imagick:
+  pkg:
+    - installed
+    - name: {{ php.imagick_pkg }}
diff --git a/php/imap.sls b/php/imap.sls
new file mode 100644
index 0000000..e7483e3
--- /dev/null
+++ b/php/imap.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-imap:
+  pkg:
+    - installed
+    - name: {{ php.imap_pkg }}
diff --git a/php/ldap.sls b/php/ldap.sls
new file mode 100644
index 0000000..b2e889c
--- /dev/null
+++ b/php/ldap.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-ldap:
+  pkg:
+    - installed
+    - name: {{ php.ldap_pkg }}
diff --git a/php/map.jinja b/php/map.jinja
index cea8b08..c67bca1 100644
--- a/php/map.jinja
+++ b/php/map.jinja
@@ -13,7 +13,13 @@
         'pear_pkg': ' php-pear',
         'soap_pkg': ' php-soap',
         'fpm_service': 'php5-fpm',
-        'xml_pkg': ' php5',
+        'xml_pkg': ' php5-xml',
+        'imagick_pkg': 'php5-imagick',
+        'suhosin_pkg': 'php5-suhosin',
+        'imap_pkg': 'php5-imap',
+        'adodb_pkg': 'php5-adodb',
+        'pgsql_pkg': 'php5-pgsql',
+        'ldap_pkg': 'php5-ldap',
     },
     'RedHat': {
         'php_pkg': 'php',
@@ -30,5 +36,11 @@
         'soap_pkg': ' php-soap',
         'fpm_service': 'php-fpm',
         'xml_pkg': ' php-xml',
+        'imagick_pkg': 'php-imagick',
+        'suhosin_pkg': 'php-suhosin',
+        'imap_pkg': 'php-imap',
+        'adodb_pkg': 'php-adodb',
+        'pgsql_pkg': 'php-pgsql',
+        'ldap_pkg': 'php-ldap',
     },
 }, merge=salt['pillar.get']('php:lookup')) %}
diff --git a/php/pgsql.sls b/php/pgsql.sls
new file mode 100644
index 0000000..6fa31d1
--- /dev/null
+++ b/php/pgsql.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-psql:
+  pkg:
+    - installed
+    - name: {{ php.psql_pkg }}
diff --git a/php/suhosin.sls b/php/suhosin.sls
new file mode 100644
index 0000000..1045afa
--- /dev/null
+++ b/php/suhosin.sls
@@ -0,0 +1,6 @@
+{% from "php/map.jinja" import php with context %}
+
+php-suhosin:
+  pkg:
+    - installed
+    - name: {{ php.suhosin_pkg }}

From 9a2dd8c067f6eb44b9223d7bc201684e18c0daf2 Mon Sep 17 00:00:00 2001
From: Fintan MacMahon <fintan.macmahon@gmail.com>
Date: Mon, 17 Feb 2014 16:11:16 +0000
Subject: [PATCH 2/3] Amended readme to include additional modules.

---
 README.rst | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/README.rst b/README.rst
index 837bed2..b1caf52 100644
--- a/README.rst
+++ b/README.rst
@@ -25,6 +25,11 @@ Installs the php package.
 
 Installs the php-apc package.
 
+``php.adodb``
+------------
+
+Installs the php-adodb package.
+
 ``php.curl``
 ------------
 
@@ -42,11 +47,43 @@ Installs the php-fpm package, starts the service, and enables it.
 
 Installs the php-gd package.
 
+
+``php.imagick``
+------------
+
+Installs the php-imagick package.
+
+``php.imap``
+------------
+
+Installs the php-imap package.
+
+``php.ldap``
+------------
+
+Installs the php-ldap package.
+
+``php.mbstring``
+---------------
+
+Installs the php-mbstring package.
+
 ``php.mcrypt``
 --------------
 
 Installs the php-mcrypt package.
 
+
+``php.memcache``
+------------
+
+Installs the php-memcache package.
+
+``php.memcached``
+------------
+
+Installs the php-memcached package.
+
 ``php.mysql``
 -------------
 
@@ -56,3 +93,23 @@ Installs the php-mysql package.
 ------------
 
 Installs the php-pear package.
+
+``php.pgsql``
+------------
+
+Installs the php-pgsql package.
+
+``php.soap``
+------------
+
+Installs the php-soap package.
+
+``php.suhosin``
+------------
+
+Installs the php-suhosin package.
+
+``php.xml``
+------------
+
+Installs the php-xml package.

From 5e3ac849e440bb8782176c92d51dbcedbc6a5f6b Mon Sep 17 00:00:00 2001
From: Fintan MacMahon <fintan.macmahon@gmail.com>
Date: Tue, 18 Feb 2014 12:18:44 +0000
Subject: [PATCH 3/3] Fixed typo

---
 php/pgsql.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/php/pgsql.sls b/php/pgsql.sls
index 6fa31d1..bfed436 100644
--- a/php/pgsql.sls
+++ b/php/pgsql.sls
@@ -1,6 +1,6 @@
 {% from "php/map.jinja" import php with context %}
 
-php-psql:
+php-pgsql:
   pkg:
     - installed
-    - name: {{ php.psql_pkg }}
+    - name: {{ php.pgsql_pkg }}