Merge pull request #111 from stokbaek/master

Added net-ipv4/6 and pear to map.jinja
This commit is contained in:
Forrest 2016-09-16 10:05:26 -07:00 committed by GitHub
commit 59b13390d5
3 changed files with 17 additions and 4 deletions

View File

@ -29,7 +29,10 @@
'imap': 'php7.0-imap', 'imap': 'php7.0-imap',
'pgsql': 'php7.0-pgsql', 'pgsql': 'php7.0-pgsql',
'ldap': 'php7.0-ldap', 'ldap': 'php7.0-ldap',
'json': 'php7.0-json' 'json': 'php7.0-json',
'pear': 'php-pear',
'net4': 'php-net-ipv4',
'net6': 'php-net-ipv6'
}, },
'fpm': { 'fpm': {
'conf': '/etc/php/7.0/fpm/php-fpm.conf', 'conf': '/etc/php/7.0/fpm/php-fpm.conf',
@ -329,7 +332,9 @@
'adodb': 'php-adodb', 'adodb': 'php-adodb',
'pgsql': 'php-pgsql', 'pgsql': 'php-pgsql',
'ldap': 'php-ldap', 'ldap': 'php-ldap',
'json': 'php-json' 'json': 'php-json',
'net4': 'php-net-ipv4',
'net6': 'php-net-ipv6'
}, },
'fpm': { 'fpm': {
'conf': '/etc/php/7.0/fpm/php-fpm.conf', 'conf': '/etc/php/7.0/fpm/php-fpm.conf',
@ -696,7 +701,9 @@
'adodb': 'php5-adodb', 'adodb': 'php5-adodb',
'pgsql': 'php5-pgsql', 'pgsql': 'php5-pgsql',
'ldap': 'php5-ldap', 'ldap': 'php5-ldap',
'json': 'php5-json' 'json': 'php5-json',
'net4': 'php-net-ipv4',
'net6': 'php-net-ipv6'
}, },
'fpm': { 'fpm': {
'conf': '/etc/php5/fpm/php-fpm.conf', 'conf': '/etc/php5/fpm/php-fpm.conf',
@ -1064,7 +1071,9 @@
'adodb': 'php5-adodb', 'adodb': 'php5-adodb',
'pgsql': 'php5-pgsql', 'pgsql': 'php5-pgsql',
'ldap': 'php5-ldap', 'ldap': 'php5-ldap',
'json': 'php5-json' 'json': 'php5-json',
'net4': 'php-net-ipv4',
'net6': 'php-net-ipv6'
}, },
'fpm': { 'fpm': {
'conf': '/etc/php5/fpm/php-fpm.conf', 'conf': '/etc/php5/fpm/php-fpm.conf',

2
php/ng/net4.sls Normal file
View File

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

2
php/ng/net6.sls Normal file
View File

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