Skip to content

Commit 7f87ee3

Browse files
johnkeatesjohnkeates
authored
Merge pull request #163 from sticky-note/fix/fpm-freebsd
Fix/fpm freebsd
2 parents 38f5246 + 0a63949 commit 7f87ee3

File tree

2 files changed

+42
-2
lines changed

2 files changed

+42
-2
lines changed

‎php/ng/fpm/config.sls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ php_fpm_conf_config:
2323
{{ php.lookup.fpm.pools }}:
2424
file.directory:
2525
- name: {{ php.lookup.fpm.pools }}
26-
- user: root
27-
- group: root
26+
- user: {{ php.lookup.fpm.user }}
27+
- group: {{ php.lookup.fpm.group }}
2828
- file_mode: 755
2929
- make_dirs: True

‎php/ng/map.jinja‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@
8484
'ini': '/etc/php/' + phpng_version + '/fpm/php.ini',
8585
'pools': '/etc/php/' + phpng_version + '/fpm/pool.d',
8686
'service': 'php' + phpng_version + '-fpm',
87+
'user': 'root',
88+
'group': 'root',
8789
'defaults': odict([
8890
('global', odict([
8991
('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
@@ -409,6 +411,8 @@
409411
'ini': '/etc/php/' + phpng_version + '/fpm/php.ini',
410412
'pools': '/etc/php/' + phpng_version + '/fpm/pool.d',
411413
'service': 'php' + phpng_version + '-fpm',
414+
'user': 'root',
415+
'group': 'root',
412416
'defaults': odict([
413417
('global', odict([
414418
('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
@@ -728,6 +732,8 @@
728732
'ini': '/etc/php/7.2/fpm/php.ini',
729733
'pools': '/etc/php/7.2/fpm/pool.d',
730734
'service': 'php7.2-fpm',
735+
'user': 'root',
736+
'group': 'root',
731737
'defaults': odict([
732738
('global', odict([
733739
('pid', '/var/run/php7.2-fpm.pid'),
@@ -1098,6 +1104,8 @@
10981104
'ini': '/etc/php/7.1/fpm/php.ini',
10991105
'pools': '/etc/php/7.1/fpm/pool.d',
11001106
'service': 'php7.1-fpm',
1107+
'user': 'root',
1108+
'group': 'root',
11011109
'defaults': odict([
11021110
('global', odict([
11031111
('pid', '/var/run/php7.1-fpm.pid'),
@@ -1468,6 +1476,8 @@
14681476
'ini': '/etc/php/7.0/fpm/php.ini',
14691477
'pools': '/etc/php/7.0/fpm/pool.d',
14701478
'service': 'php7.0-fpm',
1479+
'user': 'root',
1480+
'group': 'root',
14711481
'defaults': odict([
14721482
('global', odict([
14731483
('pid', '/var/run/php7.0-fpm.pid'),
@@ -1857,6 +1867,8 @@
18571867
'ini': '/etc/php5/fpm/php.ini',
18581868
'pools': '/etc/php5/fpm/pool.d',
18591869
'service': 'php5-fpm',
1870+
'user': 'root',
1871+
'group': 'root',
18601872
'defaults': odict([
18611873
('global', odict([
18621874
('pid', '/var/run/php5-fpm.pid'),
@@ -2241,6 +2253,8 @@
22412253
'ini': confdir + '/fpm/php.ini',
22422254
'pools': confdir + '/fpm/pool.d',
22432255
'service': 'php' + phpng_version + '-fpm',
2256+
'user': 'root',
2257+
'group': 'root',
22442258
'defaults': odict([
22452259
('global', odict([
22462260
('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
@@ -2581,6 +2595,8 @@
25812595
'ini': '/etc/php5/fpm/php.ini',
25822596
'pools': '/etc/php5/fpm/pool.d',
25832597
'service': 'php5-fpm',
2598+
'user': 'root',
2599+
'group': 'root',
25842600
'defaults': odict([
25852601
('global', odict([
25862602
('pid', '/var/run/php5-fpm.pid'),
@@ -2684,6 +2700,8 @@
26842700
'ini': '/etc/php/fpm-php' + phpng_version + '/php.ini',
26852701
'pools': '/etc/php/fpm-php' + phpng_version + '/fpm.d',
26862702
'service': 'php-fpm',
2703+
'user': 'root',
2704+
'group': 'root',
26872705
'defaults': odict([
26882706
('global', odict([
26892707
('pid', '/var/run/php-fpm-php' + phpng_version + '.pid'),
@@ -2768,6 +2786,8 @@
27682786
'ini': '/etc/' + path_suffix + 'php.ini',
27692787
'pools': '/etc/' + path_suffix + 'php-fpm.d',
27702788
'service': rh_prefix + 'php-fpm',
2789+
'user': 'root',
2790+
'group': 'root',
27712791
'defaults': {
27722792
'global': {
27732793
'pid': '/var/' + path_suffix + 'run/php-fpm/php-fpm.pid',
@@ -2814,6 +2834,8 @@
28142834
'ini': '/etc/php.ini',
28152835
'pools': '/etc/php-fpm.d',
28162836
'service': 'php-fpm',
2837+
'user': 'root',
2838+
'group': 'root',
28172839
'defaults': {
28182840
'global': {
28192841
'pid': '/var/run/php-fpm/php-fpm.pid',
@@ -2859,6 +2881,8 @@
28592881
'ini': '/etc/php/php.ini',
28602882
'pools': '/etc/php/fpm.d',
28612883
'service': 'php-fpm',
2884+
'user': 'root',
2885+
'group': 'root',
28622886
'defaults': {
28632887
'global': {
28642888
'pid': '/run/php-fpm/php-fpm.pid',
@@ -2891,6 +2915,7 @@
28912915
'curl': 'php' + freebsd_phpng_version + '-curl',
28922916
'filter': 'php' + freebsd_phpng_version + '-filter',
28932917
'fileinfo': 'php' + freebsd_phpng_version + '-fileinfo',
2918+
'fpm': 'php' + freebsd_phpng_version,
28942919
'gd': 'php' + freebsd_phpng_version + '-gd',
28952920
'hash': 'php' + freebsd_phpng_version + '-hash',
28962921
'json': 'php' + freebsd_phpng_version + '-json',
@@ -2909,6 +2934,21 @@
29092934
'xml': 'php' + freebsd_phpng_version + '-xml',
29102935
'zip': 'php' + freebsd_phpng_version + '-zip',
29112936
},
2937+
'fpm': {
2938+
'conf': '/usr/local/etc/php-fpm.conf',
2939+
'ini': '/usr/local/etc/php.ini',
2940+
'pools': '/usr/local/etc/php-fpm.d',
2941+
'service': 'php-fpm',
2942+
'user': 'root',
2943+
'group': 'wheel',
2944+
'defaults': {
2945+
'global': {
2946+
'pid': 'run/php-fpm.pid',
2947+
'error_log': 'log/php-fpm.log',
2948+
},
2949+
'include': '/usr/local/etc/php-fpm.d/*.conf',
2950+
},
2951+
},
29122952
},
29132953
}),
29142954
'fpm': {

0 commit comments

Comments
 (0)