From c0cd87cc1f1b302e982ee48ba5f9e596789af661 Mon Sep 17 00:00:00 2001 From: giannello Date: Wed, 9 Apr 2014 16:41:35 +0200 Subject: [PATCH 1/5] Added mapping for MySQL Native Driver extension --- php/map.jinja | 2 ++ 1 file changed, 2 insertions(+) diff --git a/php/map.jinja b/php/map.jinja index c67bca1..2c6c1de 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -10,6 +10,7 @@ 'memcache_pkg': 'php5-memcache', 'memcached_pkg': 'php5-memcached', 'mysql_pkg': 'php5-mysql', + 'mysqlnd_pkg': 'php5-mysqlnd', 'pear_pkg': ' php-pear', 'soap_pkg': ' php-soap', 'fpm_service': 'php5-fpm', @@ -32,6 +33,7 @@ 'memcache_pkg': 'php-pecl-memcache', 'memcached_pkg': 'php-pecl-memcached', 'mysql_pkg': 'php-mysql', + 'mysqlnd_pkg': 'php-mysqlnd', 'pear_pkg': ' php-pear', 'soap_pkg': ' php-soap', 'fpm_service': 'php-fpm', From 195a411abb1d6d0920ce089948fa6c4895334487 Mon Sep 17 00:00:00 2001 From: Giuseppe Iannello Date: Wed, 9 Apr 2014 16:42:42 +0200 Subject: [PATCH 2/5] Added MySQL Native Driver extension --- php/mysqlnd.sls | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 php/mysqlnd.sls diff --git a/php/mysqlnd.sls b/php/mysqlnd.sls new file mode 100644 index 0000000..2dda9f3 --- /dev/null +++ b/php/mysqlnd.sls @@ -0,0 +1,6 @@ +{% from "php/map.jinja" import php with context %} + +php-mysqlnd: + pkg: + - installed + - name: {{ php.mysqlnd_pkg }} From 7e39eb51bf3aae66d882ae890ac486a90df13164 Mon Sep 17 00:00:00 2001 From: Giuseppe Iannello Date: Wed, 9 Apr 2014 16:43:58 +0200 Subject: [PATCH 3/5] Updated README --- README.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.rst b/README.rst index b1caf52..1d8c4c3 100644 --- a/README.rst +++ b/README.rst @@ -89,6 +89,11 @@ Installs the php-memcached package. Installs the php-mysql package. +``php.mysqlnd`` +------------ + +Installs the php-mysqlnd package. + ``php.pear`` ------------ From 4f45372ff3814c1dd7664ecd1fa005c9774ab2d0 Mon Sep 17 00:00:00 2001 From: Giuseppe Iannello Date: Wed, 9 Apr 2014 16:52:01 +0200 Subject: [PATCH 4/5] Added php-cli package --- README.rst | 5 +++++ php/cli.sls | 6 ++++++ php/map.jinja | 2 ++ 3 files changed, 13 insertions(+) create mode 100644 php/cli.sls diff --git a/README.rst b/README.rst index 1d8c4c3..f2f8356 100644 --- a/README.rst +++ b/README.rst @@ -28,6 +28,11 @@ Installs the php-apc package. ``php.adodb`` ------------ +Installs the php-cli package. + +``php.cli`` +------------ + Installs the php-adodb package. ``php.curl`` diff --git a/php/cli.sls b/php/cli.sls new file mode 100644 index 0000000..dab4ed3 --- /dev/null +++ b/php/cli.sls @@ -0,0 +1,6 @@ +{% from "php/map.jinja" import php with context %} + +php-cli: + pkg: + - installed + - name: {{ php.cli_pkg }} diff --git a/php/map.jinja b/php/map.jinja index 2c6c1de..329e530 100644 --- a/php/map.jinja +++ b/php/map.jinja @@ -2,6 +2,7 @@ 'Debian': { 'php_pkg': 'php5', 'apc_pkg': 'php-apc', + 'cli_pkg': 'php5-cli', 'curl_pkg': 'php5-curl', 'fpm_pkg': 'php5-fpm', 'gd_pkg': 'php5-gd', @@ -25,6 +26,7 @@ 'RedHat': { 'php_pkg': 'php', 'apc_pkg': 'php-pecl-apc', + 'cli_pkg': 'php-cli', 'curl_pkg': 'curl', 'fpm_pkg': 'php-fpm', 'gd_pkg': 'php-gd', From b97bd298b9cf3c18e5e6fd6eec5992d03fb88044 Mon Sep 17 00:00:00 2001 From: Giuseppe Iannello Date: Wed, 9 Apr 2014 16:53:26 +0200 Subject: [PATCH 5/5] Fixed README order --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index f2f8356..e7f4fa7 100644 --- a/README.rst +++ b/README.rst @@ -28,12 +28,12 @@ Installs the php-apc package. ``php.adodb`` ------------ -Installs the php-cli package. +Installs the php-adodb package. ``php.cli`` ------------ -Installs the php-adodb package. +Installs the php-cli package. ``php.curl`` ------------