Skip to content

add 'bz2' and 'dba' module support #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions docs/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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``
^^^^^^^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -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``
^^^^^^^^^^^^^^

Expand Down Expand Up @@ -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``
^^^^^^^^^^^^^^^^

Expand Down
2 changes: 2 additions & 0 deletions php/ng/bz2.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{% set state = 'bz2' %}
{% include "php/ng/installed.jinja" %}
2 changes: 2 additions & 0 deletions php/ng/dba.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{% set state = 'dba' %}
{% include "php/ng/installed.jinja" %}
16 changes: 16 additions & 0 deletions php/ng/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -343,13 +345,15 @@
'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',
'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',
Expand Down Expand Up @@ -672,13 +676,15 @@
'apc': 'php',
'apcu': 'php-apcu',
'bcmath': 'php7.2-bcmath',
'bz2': 'php7.2-bz2',
'cache-lite': 'php-cache-lite',
'cgi': 'php-cgi',
'cli': 'php-cli',
'console-table': 'php-console-table',
'composer_bin': 'composer',
'curl': 'php-curl',
'dev': 'php7.2-dev',
'dba': 'php7.2-dba',
'fpm': 'php-fpm',
'gd': 'php-gd',
'geoip': 'php-geoip',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -2186,13 +2196,15 @@
'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',
'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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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]'}],
Expand Down Expand Up @@ -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',
Expand Down