saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make php.ng.maps.jinja work for php5 on Debian. Fixed config dir.

Browse Source
This commit is contained in:
Vitali Quiering 2017-02-16 10:42:15 +01:00
parent ba15ee1368
commit 51984f06de
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
php/ng/map.jinja
View File

@ -1400,6 +1400,11 @@
{%- endif %} {%- endif %}
{%- elif salt['grains.get']('os') == "Debian" %} {%- elif salt['grains.get']('os') == "Debian" %}
{%- set phpng_version = salt['pillar.get']('php:ng:version', '7.0')|string %} {%- set phpng_version = salt['pillar.get']('php:ng:version', '7.0')|string %}
{%- if phpng_version|string == '5' %}
{%- set confdir = '/etc/php5' %}
{%- else %}
{%- set confdir = '/etc/php/' + phpng_version %}
{%- endif %}
{%- 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': {
@ -1468,16 +1473,16 @@
'zip': 'php' + phpng_version + '-zip', 'zip': 'php' + phpng_version + '-zip',
}, },
'fpm': { 'fpm': {
'conf': '/etc/php/' + phpng_version + '/fpm/php-fpm.conf', 'conf': confdir + '/fpm/php-fpm.conf',
'ini': '/etc/php/' + phpng_version + '/fpm/php.ini', 'ini': confdir + '/fpm/php.ini',
'pools': '/etc/php/' + phpng_version + '/fpm/pool.d', 'pools': confdir + '/fpm/pool.d',
'service': 'php' + phpng_version + '-fpm', 'service': 'php' + phpng_version + '-fpm',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php' + phpng_version + '-fpm.pid'), ('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
('error_log', '/var/log/php' + phpng_version + '-fpm.log'), ('error_log', '/var/log/php' + phpng_version + '-fpm.log'),
])), ])),
('include', '/etc/php/' + phpng_version + '/fpm/pool.d/*.conf'), ('include', confdir + '/fpm/pool.d/*.conf'),
]), ]),
}, },
'hhvm': { 'hhvm': {
@ -1505,10 +1510,10 @@
]), ]),
}, },
'cli': { 'cli': {
'ini': '/etc/php/' + phpng_version + '/cli/php.ini', 'ini': confdir + '/cli/php.ini',
}, },
'apache2': { 'apache2': {
'ini': '/etc/php/' + phpng_version + '/apache2/php.ini', 'ini': confdir + '/apache2/php.ini',
}, },
}, },
}), }),