Leverage kindly provided specials/block syntax to fully support Gentoo.
This commit is contained in:
Mark Gomersbach
parent
19fb0d3f1d
commit
9ba295ad68
@ -2489,6 +2489,7 @@
|
|||||||
},
|
},
|
||||||
}, merge=True) %}
|
}, merge=True) %}
|
||||||
{%- else %}
|
{%- else %}
|
||||||
|
{%- set useversion = phpng_version | replace(".", "-") -%}
|
||||||
{%- set php = salt['pillar.get']('php:ng', {
|
{%- set php = salt['pillar.get']('php:ng', {
|
||||||
'lookup': salt['grains.filter_by']({
|
'lookup': salt['grains.filter_by']({
|
||||||
'Debian': {
|
'Debian': {
|
||||||
@ -2612,6 +2613,81 @@
|
|||||||
'defaults': {},
|
'defaults': {},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
'Gentoo' : {
|
||||||
|
'pkgs': {
|
||||||
|
'apache2': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[apache2]'}],
|
||||||
|
'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]'}],
|
||||||
|
'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]'}],
|
||||||
|
'composer_bin': 'composer',
|
||||||
|
'console-table': 'dev-php/PEAR-Console_Table',
|
||||||
|
'curl': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[curl]'}],
|
||||||
|
'ext_conf_path': '/etc/php/fpm-php' + phpng_version + '/ext',
|
||||||
|
'fpm': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[fpm]'}],
|
||||||
|
'gd': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[gd]'}],
|
||||||
|
'geoip': [{'name': 'dev-php/pecl-geoip','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'gettext': 'dev-php/PEAR-File_Gettext',
|
||||||
|
'gmp': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[gmp]'}],
|
||||||
|
'imagick': [{'name': 'dev-php/pecl-imagick','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'imap': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[imap]'}],
|
||||||
|
'intl': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[intl]'}],
|
||||||
|
'json': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[json]'}],
|
||||||
|
'ldap': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[ldap]'}],
|
||||||
|
'local_bin': '/usr/local/bin',
|
||||||
|
'auth-sasl': 'dev-php/PEAR-Auth_SASL',
|
||||||
|
'mail': 'dev-php/PHPMailer',
|
||||||
|
'memcache': [{'name': 'dev-php/pecl-memcache','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'memcached': [{'name': 'dev-php/pecl-memcached','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'mongo': [{'name': 'dev-php/pecl-mongo','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'mongodb': [{'name': 'dev-php/pecl-mongodb','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'mysqlnd': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[mysql]'}],
|
||||||
|
'mysql': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[mysqli]'}],
|
||||||
|
'net-smtp': 'dev-php/PEAR-Net_SMTP',
|
||||||
|
'net4': 'dev-php/PEAR-Net_IPv4',
|
||||||
|
'net6': 'dev-php/PEAR-Net_IPv6',
|
||||||
|
'oauth': [{'name': 'dev-php/pecl-oauth','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'opcache': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[opcache]'}],
|
||||||
|
'pear': 'dev-php/pear',
|
||||||
|
'pgsql': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[postgres]'}],
|
||||||
|
'php': [{'name': 'dev-lang/php','version': '~:' + phpng_version}],
|
||||||
|
'pspell': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[spell]'}],
|
||||||
|
'redis': [{'name': 'dev-php/pecl-redis','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'snmp': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[snmp]'}],
|
||||||
|
'soap': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[soap]'}],
|
||||||
|
'ssh2': [{'name': 'dev-php/pecl-ssh2','version': '[php_targets_php' + useversion + ']'}],
|
||||||
|
'sqlite': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[sqlite]'}],
|
||||||
|
'sybase': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[sybase-ct]'}],
|
||||||
|
'tcpdf': 'dev-php/tcpdf',
|
||||||
|
'temp_dir': '/tmp',
|
||||||
|
'tidy': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[tidy]'}],
|
||||||
|
'xdebug': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[debug]'}],
|
||||||
|
'xml': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[xml]'}],
|
||||||
|
'xsl': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[xslt]'}],
|
||||||
|
'zip': [{'name': 'dev-lang/php','version': ':' + phpng_version + '[zip]'}],
|
||||||
|
},
|
||||||
|
'fpm': {
|
||||||
|
'conf': '/etc/php/fpm-php' + phpng_version + '/php-fpm.conf',
|
||||||
|
'ini': '/etc/php/fpm-php' + phpng_version + '/php.ini',
|
||||||
|
'pools': '/etc/php/fpm-php' + phpng_version + '/fpm.d',
|
||||||
|
'service': 'php-fpm',
|
||||||
|
'defaults': odict([
|
||||||
|
('global', odict([
|
||||||
|
('pid', '/var/run/php-fpm-php' + phpng_version + '.pid'),
|
||||||
|
('error_log', '/var/log/php' + phpng_version + '-fpm.log'),
|
||||||
|
])),
|
||||||
|
('include', '/etc/php/fpm-php' + phpng_version + '/fpm.d/*.conf'),
|
||||||
|
]),
|
||||||
|
},
|
||||||
|
'cli': {
|
||||||
|
'ini': '/etc/php/cli-php' + phpng_version + '/php.ini',
|
||||||
|
},
|
||||||
|
'apache2': {
|
||||||
|
'ini': '/etc/php/apache2-php' + phpng_version + '/php.ini',
|
||||||
|
},
|
||||||
|
},
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
'pkgs': {
|
'pkgs': {
|
||||||
'adodb': 'php-adodb',
|
'adodb': 'php-adodb',
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user