Skip to content

Commit 0a63949

Browse files
author
sam
committed
add minimum default to get fpm service works on FreeBSD
1 parent b702a35 commit 0a63949

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

php/ng/map.jinja

Lines changed: 14 additions & 14 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'),
@@ -125,8 +127,6 @@
125127
},
126128
}),
127129
'fpm': {
128-
'user': 'root',
129-
'group': 'root',
130130
'service': {
131131
'enabled': True,
132132
'opts': {},
@@ -411,6 +411,8 @@
411411
'ini': '/etc/php/' + phpng_version + '/fpm/php.ini',
412412
'pools': '/etc/php/' + phpng_version + '/fpm/pool.d',
413413
'service': 'php' + phpng_version + '-fpm',
414+
'user': 'root',
415+
'group': 'root',
414416
'defaults': odict([
415417
('global', odict([
416418
('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
@@ -452,8 +454,6 @@
452454
},
453455
}),
454456
'fpm': {
455-
'user': 'root',
456-
'group': 'root',
457457
'service': {
458458
'enabled': True,
459459
'opts': {},
@@ -732,6 +732,8 @@
732732
'ini': '/etc/php/7.2/fpm/php.ini',
733733
'pools': '/etc/php/7.2/fpm/pool.d',
734734
'service': 'php7.2-fpm',
735+
'user': 'root',
736+
'group': 'root',
735737
'defaults': odict([
736738
('global', odict([
737739
('pid', '/var/run/php7.2-fpm.pid'),
@@ -777,8 +779,6 @@
777779
},
778780
}, grain="os"),
779781
'fpm': {
780-
'user': 'root',
781-
'group': 'root',
782782
'service': {
783783
'enabled': True,
784784
'opts': {},
@@ -1104,6 +1104,8 @@
11041104
'ini': '/etc/php/7.1/fpm/php.ini',
11051105
'pools': '/etc/php/7.1/fpm/pool.d',
11061106
'service': 'php7.1-fpm',
1107+
'user': 'root',
1108+
'group': 'root',
11071109
'defaults': odict([
11081110
('global', odict([
11091111
('pid', '/var/run/php7.1-fpm.pid'),
@@ -1149,8 +1151,6 @@
11491151
},
11501152
}, grain="os"),
11511153
'fpm': {
1152-
'user': 'root',
1153-
'group': 'root',
11541154
'service': {
11551155
'enabled': True,
11561156
'opts': {},
@@ -1476,6 +1476,8 @@
14761476
'ini': '/etc/php/7.0/fpm/php.ini',
14771477
'pools': '/etc/php/7.0/fpm/pool.d',
14781478
'service': 'php7.0-fpm',
1479+
'user': 'root',
1480+
'group': 'root',
14791481
'defaults': odict([
14801482
('global', odict([
14811483
('pid', '/var/run/php7.0-fpm.pid'),
@@ -1521,8 +1523,6 @@
15211523
},
15221524
}, grain="os"),
15231525
'fpm': {
1524-
'user': 'root',
1525-
'group': 'root',
15261526
'service': {
15271527
'enabled': True,
15281528
'opts': {},
@@ -1867,6 +1867,8 @@
18671867
'ini': '/etc/php5/fpm/php.ini',
18681868
'pools': '/etc/php5/fpm/pool.d',
18691869
'service': 'php5-fpm',
1870+
'user': 'root',
1871+
'group': 'root',
18701872
'defaults': odict([
18711873
('global', odict([
18721874
('pid', '/var/run/php5-fpm.pid'),
@@ -1912,8 +1914,6 @@
19121914
},
19131915
}, grain="os"),
19141916
'fpm': {
1915-
'user': 'root',
1916-
'group': 'root',
19171917
'service': {
19181918
'enabled': True,
19191919
'opts': {},
@@ -2253,6 +2253,8 @@
22532253
'ini': confdir + '/fpm/php.ini',
22542254
'pools': confdir + '/fpm/pool.d',
22552255
'service': 'php' + phpng_version + '-fpm',
2256+
'user': 'root',
2257+
'group': 'root',
22562258
'defaults': odict([
22572259
('global', odict([
22582260
('pid', '/var/run/php' + phpng_version + '-fpm.pid'),
@@ -2294,8 +2296,6 @@
22942296
},
22952297
}),
22962298
'fpm': {
2297-
'user': 'root',
2298-
'group': 'root',
22992299
'service': {
23002300
'enabled': True,
23012301
'opts': {},

0 commit comments

Comments
 (0)