ExternalMirrors
/
php-formula
mirror of https://github.com/saltstack-formulas/php-formula
Watch 1
Star 0
Fork 1
Code Issues 0 Releases 33 Wiki Activity
Browse Source

Merge pull request #163 from sticky-note/fix/fpm-freebsd 

Fix/fpm freebsd
tags/v0.34.0
John Keates 6 years ago
parent
38f5246f49 0a63949ef0
commit
7f87ee33d0
No account linked to committer's email address
2 changed files with 42 additions and 2 deletions
Unified View Show Diff Stats
  1. +2
    -2
      php/ng/fpm/config.sls
  2. +40
    -0
      php/ng/map.jinja

+ 2
- 2
php/ng/fpm/config.sls View File

{{ php.lookup.fpm.pools }}: {{ php.lookup.fpm.pools }}:
file.directory: file.directory:
- name: {{ php.lookup.fpm.pools }} - name: {{ php.lookup.fpm.pools }}
- user: root
- group: root
- user: {{ php.lookup.fpm.user }}
- group: {{ php.lookup.fpm.group }}
- file_mode: 755 - file_mode: 755
- make_dirs: True - make_dirs: True

+ 40
- 0
php/ng/map.jinja View File

'ini': '/etc/php/' + phpng_version + '/fpm/php.ini', 'ini': '/etc/php/' + phpng_version + '/fpm/php.ini',
'pools': '/etc/php/' + phpng_version + '/fpm/pool.d', 'pools': '/etc/php/' + phpng_version + '/fpm/pool.d',
'service': 'php' + phpng_version + '-fpm', 'service': 'php' + phpng_version + '-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php' + phpng_version + '-fpm.pid'), ('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
'ini': '/etc/php/' + phpng_version + '/fpm/php.ini', 'ini': '/etc/php/' + phpng_version + '/fpm/php.ini',
'pools': '/etc/php/' + phpng_version + '/fpm/pool.d', 'pools': '/etc/php/' + phpng_version + '/fpm/pool.d',
'service': 'php' + phpng_version + '-fpm', 'service': 'php' + phpng_version + '-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php' + phpng_version + '-fpm.pid'), ('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
'ini': '/etc/php/7.2/fpm/php.ini', 'ini': '/etc/php/7.2/fpm/php.ini',
'pools': '/etc/php/7.2/fpm/pool.d', 'pools': '/etc/php/7.2/fpm/pool.d',
'service': 'php7.2-fpm', 'service': 'php7.2-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php7.2-fpm.pid'), ('pid', '/var/run/php7.2-fpm.pid'),
'ini': '/etc/php/7.1/fpm/php.ini', 'ini': '/etc/php/7.1/fpm/php.ini',
'pools': '/etc/php/7.1/fpm/pool.d', 'pools': '/etc/php/7.1/fpm/pool.d',
'service': 'php7.1-fpm', 'service': 'php7.1-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php7.1-fpm.pid'), ('pid', '/var/run/php7.1-fpm.pid'),
'ini': '/etc/php/7.0/fpm/php.ini', 'ini': '/etc/php/7.0/fpm/php.ini',
'pools': '/etc/php/7.0/fpm/pool.d', 'pools': '/etc/php/7.0/fpm/pool.d',
'service': 'php7.0-fpm', 'service': 'php7.0-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php7.0-fpm.pid'), ('pid', '/var/run/php7.0-fpm.pid'),
'ini': '/etc/php5/fpm/php.ini', 'ini': '/etc/php5/fpm/php.ini',
'pools': '/etc/php5/fpm/pool.d', 'pools': '/etc/php5/fpm/pool.d',
'service': 'php5-fpm', 'service': 'php5-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php5-fpm.pid'), ('pid', '/var/run/php5-fpm.pid'),
'ini': confdir + '/fpm/php.ini', 'ini': confdir + '/fpm/php.ini',
'pools': confdir + '/fpm/pool.d', 'pools': confdir + '/fpm/pool.d',
'service': 'php' + phpng_version + '-fpm', 'service': 'php' + phpng_version + '-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php' + phpng_version + '-fpm.pid'), ('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
'ini': '/etc/php5/fpm/php.ini', 'ini': '/etc/php5/fpm/php.ini',
'pools': '/etc/php5/fpm/pool.d', 'pools': '/etc/php5/fpm/pool.d',
'service': 'php5-fpm', 'service': 'php5-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php5-fpm.pid'), ('pid', '/var/run/php5-fpm.pid'),
'ini': '/etc/php/fpm-php' + phpng_version + '/php.ini', 'ini': '/etc/php/fpm-php' + phpng_version + '/php.ini',
'pools': '/etc/php/fpm-php' + phpng_version + '/fpm.d', 'pools': '/etc/php/fpm-php' + phpng_version + '/fpm.d',
'service': 'php-fpm', 'service': 'php-fpm',
'user': 'root',
'group': 'root',
'defaults': odict([ 'defaults': odict([
('global', odict([ ('global', odict([
('pid', '/var/run/php-fpm-php' + phpng_version + '.pid'), ('pid', '/var/run/php-fpm-php' + phpng_version + '.pid'),
'ini': '/etc/' + path_suffix + 'php.ini', 'ini': '/etc/' + path_suffix + 'php.ini',
'pools': '/etc/' + path_suffix + 'php-fpm.d', 'pools': '/etc/' + path_suffix + 'php-fpm.d',
'service': rh_prefix + 'php-fpm', 'service': rh_prefix + 'php-fpm',
'user': 'root',
'group': 'root',
'defaults': { 'defaults': {
'global': { 'global': {
'pid': '/var/' + path_suffix + 'run/php-fpm/php-fpm.pid', 'pid': '/var/' + path_suffix + 'run/php-fpm/php-fpm.pid',
'ini': '/etc/php.ini', 'ini': '/etc/php.ini',
'pools': '/etc/php-fpm.d', 'pools': '/etc/php-fpm.d',
'service': 'php-fpm', 'service': 'php-fpm',
'user': 'root',
'group': 'root',
'defaults': { 'defaults': {
'global': { 'global': {
'pid': '/var/run/php-fpm/php-fpm.pid', 'pid': '/var/run/php-fpm/php-fpm.pid',
'ini': '/etc/php/php.ini', 'ini': '/etc/php/php.ini',
'pools': '/etc/php/fpm.d', 'pools': '/etc/php/fpm.d',
'service': 'php-fpm', 'service': 'php-fpm',
'user': 'root',
'group': 'root',
'defaults': { 'defaults': {
'global': { 'global': {
'pid': '/run/php-fpm/php-fpm.pid', 'pid': '/run/php-fpm/php-fpm.pid',
'curl': 'php' + freebsd_phpng_version + '-curl', 'curl': 'php' + freebsd_phpng_version + '-curl',
'filter': 'php' + freebsd_phpng_version + '-filter', 'filter': 'php' + freebsd_phpng_version + '-filter',
'fileinfo': 'php' + freebsd_phpng_version + '-fileinfo', 'fileinfo': 'php' + freebsd_phpng_version + '-fileinfo',
'fpm': 'php' + freebsd_phpng_version,
'gd': 'php' + freebsd_phpng_version + '-gd', 'gd': 'php' + freebsd_phpng_version + '-gd',
'hash': 'php' + freebsd_phpng_version + '-hash', 'hash': 'php' + freebsd_phpng_version + '-hash',
'json': 'php' + freebsd_phpng_version + '-json', 'json': 'php' + freebsd_phpng_version + '-json',
'xml': 'php' + freebsd_phpng_version + '-xml', 'xml': 'php' + freebsd_phpng_version + '-xml',
'zip': 'php' + freebsd_phpng_version + '-zip', 'zip': 'php' + freebsd_phpng_version + '-zip',
}, },
'fpm': {
'conf': '/usr/local/etc/php-fpm.conf',
'ini': '/usr/local/etc/php.ini',
'pools': '/usr/local/etc/php-fpm.d',
'service': 'php-fpm',
'user': 'root',
'group': 'wheel',
'defaults': {
'global': {
'pid': 'run/php-fpm.pid',
'error_log': 'log/php-fpm.log',
},
'include': '/usr/local/etc/php-fpm.d/*.conf',
},
},
}, },
}), }),
'fpm': { 'fpm': {

Write Preview
Loading…
Cancel
Save