Merge pull request #177 from FHE3/bz2-dba-support

add 'bz2' and 'dba' module support

docs/README.rst

@@ -306,6 +306,11 @@ Installs the php-auth-sasl package.
 
 Installs the php-bcmath package.
 
+``php.ng.bz2``
+^^^^^^^^^^^^^^
+
+Installs the php-bz2 package.
+
 ``php.ng.cache-lite``
 ^^^^^^^^^^^^^^^^^^^^^
 
@@ -354,6 +359,11 @@ Installs the php5-curl package on Debian, and ensures that curl itself is
 installed for RedHat systems, this is due to the curl libs being provided by
 php-common, which will get installed with the main php package.
 
+``php.ng.dba``
+^^^^^^^^^^^^^^
+
+Installs the php-dba package.
+
 ``php.ng.dev``
 ^^^^^^^^^^^^^^
 
@@ -532,6 +542,13 @@ Disabled on opensuse need server:php:extensions repo
 Installs the php-memcached package.
 Disabled on opensuse need server:php:extensions repo
 
+``php.ng.modules``
+^^^^^^^^^^^^^^^^^^
+
+Calls ``php.ng.<name>`` for each entry in ``php:ng:modules`` if available, or
+try to install the matching packages that can be set via from
+``php:ng:lookup:pkgs``
+
 ``php.ng.mongo``
 ^^^^^^^^^^^^^^^^
 

php/ng/bz2.sls

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

php/ng/dba.sls

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

php/ng/map.jinja

@@ -18,12 +18,14 @@
                             'apcu': 'php-apcu-bc',
                             'bcmath': 'php' + phpng_version + '-bcmath',
                             'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'pkg-config', 'libsslcommon2-dev', 'gcc', 'make', 'autoconf', 'libc-dev', 'pkg-config'],
+                            'bz2': 'php' + phpng_version + '-bz2',
                             'cache-lite': 'php-cache-lite',
                             'cgi': 'php' + phpng_version + '-cgi',
                             'cli': 'php' + phpng_version + '-cli',
                             'composer_bin': 'composer',
                             'console-table': 'php-console-table',
                             'curl': 'php' + phpng_version + '-curl',
+                            'dba': 'php' + phpng_version + '-dba',
                             'dev': 'php' + phpng_version + '-dev',
                             'ext_conf_path': '/etc/php/' + phpng_version + '/mods-available',
                             'fpm': 'php' + phpng_version + '-fpm',
@@ -343,6 +345,7 @@
                             'apc': 'php-apcu',
                             'apcu': 'php-apcu-bc',
                             'bcmath': 'php' + phpng_version + '-bcmath',
+                            'bz2': 'php' + phpng_version + '-bz2',
                             'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'gcc', 'make', 'autoconf', 'libc-dev', 'pkg-config'],
                             'cache-lite': 'php-cache-lite',
                             'cgi': 'php' + phpng_version + '-cgi',
@@ -350,6 +353,7 @@
                             'composer_bin': 'composer',
                             'console-table': 'php-console-table',
                             'curl': 'php' + phpng_version + '-curl',
+                            'dba': 'php' + phpng_version + '-dba',
                             'dev': 'php' + phpng_version + '-dev',
                             'ext_conf_path': '/etc/php/' + phpng_version + '/mods-available',
                             'fpm': 'php' + phpng_version + '-fpm',
@@ -672,6 +676,7 @@
                             'apc': 'php',
                             'apcu': 'php-apcu',
                             'bcmath': 'php7.2-bcmath',
+                            'bz2': 'php7.2-bz2',
                             'cache-lite': 'php-cache-lite',
                             'cgi': 'php-cgi',
                             'cli': 'php-cli',
@@ -679,6 +684,7 @@
                             'composer_bin': 'composer',
                             'curl': 'php-curl',
                             'dev': 'php7.2-dev',
+                            'dba': 'php7.2-dba',
                             'fpm': 'php-fpm',
                             'gd': 'php-gd',
                             'geoip': 'php-geoip',
@@ -1044,12 +1050,14 @@
                             'apc': 'php',
                             'apcu': 'php-apcu',
                             'bcmath': 'php7.1-bcmath',
+                            'bz2': 'php7.1-bz2',
                             'cache-lite': 'php-cache-lite',
                             'cgi': 'php-cgi',
                             'cli': 'php-cli',
                             'console-table': 'php-console-table',
                             'composer_bin': 'composer',
                             'curl': 'php-curl',
+                            'dba': 'php7.1-dba',
                             'dev': 'php7.1-dev',
                             'fpm': 'php-fpm',
                             'gd': 'php-gd',
@@ -1416,12 +1424,14 @@
                             'apc': 'php',
                             'apcu': 'php-apcu',
                             'bcmath': 'php7.0-bcmath',
+                            'bz2': 'php7.0-bz2',
                             'cache-lite': 'php-cache-lite',
                             'cgi': 'php-cgi',
                             'cli': 'php-cli',
                             'console-table': 'php-console-table',
                             'composer_bin': 'composer',
                             'curl': 'php-curl',
+                            'dba': 'php7.0-dba',
                             'dev': 'php7.0-dev',
                             'fpm': 'php-fpm',
                             'gd': 'php-gd',
@@ -2186,6 +2196,7 @@
                             'apc': 'php-apcu',
                             'apcu': 'php-apcu-bc',
                             'bcmath': 'php' + phpng_version + '-bcmath',
+                            'bz2': 'php' + phpng_version + '-bz2',
                             'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'pkg-config', 'libsslcommon2-dev', 'gcc', 'make', 'autoconf', 'libc-dev', 'pkg-config'],
                             'cache-lite': 'php-cache-lite',
                             'cgi': 'php' + phpng_version + '-cgi',
@@ -2193,6 +2204,7 @@
                             'composer_bin': 'composer',
                             'console-table': 'php-console-table',
                             'curl': 'php' + phpng_version + '-curl',
+                            'dba': 'php' + phpng_version + '-dba',
                             'dev': 'php' + phpng_version + '-dev',
                             'ext_conf_path': '/etc/php/' + phpng_version + '/mods-available',
                             'fpm': 'php' + phpng_version + '-fpm',
@@ -2528,12 +2540,14 @@
                     'apcu': 'php5-apcu',
                     'bcmath': 'php5',
                     'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev'],
+                    'bz2': 'php5-bz2',
                     'cache-lite': 'php-cache-lite',
                     'cgi': 'php5-cgi',
                     'cli': 'php5-cli',
                     'console-table': 'php-console-table',
                     'composer_bin': 'composer',
                     'curl': 'php5-curl',
+                    'dba': 'php5-dba',
                     'dev': ['php5-dev','build-essential'],
                     'ext_conf_path': '/etc/php5/mods-available',
                     'fpm': 'php5-fpm',
@@ -2649,6 +2663,7 @@
                     'apc': [{'name': 'dev-php/pecl-apcu_bc','version': '[php_targets_php' + useversion + ']'}],
                     'apcu': [{'name': 'dev-php/pecl-apcu','version': '[php_targets_php' + useversion + ']'}],
                     'bcmath': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[bcmath]'}],
+                    'bz2': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[bzip2]'}],
                     'cache-lite': 'dev-php/PEAR-Cache_Lite',
                     'cgi': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[cgi]'}],
                     'cli': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[cli]'}],
@@ -2734,6 +2749,7 @@
                     'composer_bin': 'composer',
                     'console-table': 'php-pear-Console-Table',
                     'curl': [rh_prefix + 'php-common', 'curl'],
+                    'dba': [rh_prefix + 'php-dba', 'dba'],
                     'dev': rh_prefix + 'php-devel',
                     'ext_conf_path': '/etc/' + path_suffix + 'php.d',
                     'fpm': rh_prefix + 'php-fpm',