/[smecontribs]/rpms/smeserver-php-fpm/contribs9/smeserver-php-fpm-0.1.1.bz10851-php72php73.patch
ViewVC logotype

Annotation of /rpms/smeserver-php-fpm/contribs9/smeserver-php-fpm-0.1.1.bz10851-php72php73.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Mon Dec 16 18:56:19 2019 UTC (4 years, 11 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-php-fpm-0_1_1-2_el6_sme
* Mon Dec 16 2019 Jean-Philipe Pialasse <tests@pialasse.com> 0.1.1-2.sme
- import to mecontribs
- add php72 and php73 fix [SME: 10851]

1 jpp 1.1 diff -Nur smeserver-php-fpm-0.1.1.old/CHANGELOG.git smeserver-php-fpm-0.1.1/CHANGELOG.git
2     --- smeserver-php-fpm-0.1.1.old/CHANGELOG.git 2017-07-27 18:11:13.000000000 +0200
3     +++ smeserver-php-fpm-0.1.1/CHANGELOG.git 1970-01-01 01:00:00.000000000 +0100
4     @@ -1,380 +0,0 @@
5     -commit 0718fc8b4abb10e77cdbc91bcd59422033a89d0e
6     -Author: Daniel Berteaud <daniel@firewall-services.com>
7     -Date: Thu Jul 27 18:05:00 2017 +0200
8     -
9     - Fix closing parenthesis on prop method
10     -
11     -commit fd8f348ce19fc6b450c09f71f074fc148917e733
12     -Author: Daniel Berteaud <daniel@firewall-services.com>
13     -Date: Wed Jul 26 17:20:31 2017 +0200
14     -
15     - Spec file changes
16     - Including build for x86_64 only. While this package itself is noarch, it depends on x86_64 only packages
17     -
18     -commit fa3d2112cd135360ed792f511a41c390cfb9e324
19     -Author: Daniel Berteaud <daniel@firewall-services.com>
20     -Date: Fri Jul 14 16:57:05 2017 +0200
21     -
22     - Simplify mod_fastcgi config template
23     -
24     -commit 05acd7065887b777a1876962207a9b08037a40eb
25     -Author: Daniel Berteaud <daniel@firewall-services.com>
26     -Date: Fri Jul 14 16:53:28 2017 +0200
27     -
28     - Fix reading status prop for cutom pools
29     -
30     -commit a317932158e9002c3aebe075dbe86984d21e38e7
31     -Author: Daniel Berteaud <daniel@firewall-services.com>
32     -Date: Fri Jul 14 16:52:04 2017 +0200
33     -
34     - Add templates.metadata for custom php pools
35     -
36     -commit d37510d18b7e254bbc4511bb3d162c0330fc4358
37     -Author: Daniel Berteaud <daniel@firewall-services.com>
38     -Date: Fri Jul 14 16:48:25 2017 +0200
39     -
40     - Missing closing quote and semi-colon
41     -
42     -commit 5bd514c6e355782cfe489a544f5e00841c647a1d
43     -Author: Daniel Berteaud <daniel@firewall-services.com>
44     -Date: Fri Jul 14 13:57:11 2017 +0200
45     -
46     - Expand custom pools files
47     -
48     -commit fc97f8f92728fef9ab441f8dd24d4f1ed9b993b2
49     -Author: Daniel Berteaud <daniel@firewall-services.com>
50     -Date: Fri Jul 14 13:55:39 2017 +0200
51     -
52     - Fix httpd template syntaxe
53     -
54     -commit 3f76ffa14155d9e13502de7a63dfa88a8ac802b2
55     -Author: Daniel Berteaud <daniel@firewall-services.com>
56     -Date: Fri Jul 14 12:40:34 2017 +0200
57     -
58     - Possibility to use a custom PHP pool per share
59     -
60     -commit d7656b699c09a696166ee83d197bdfbd9cb4ee0a
61     -Author: Daniel Berteaud <daniel@firewall-services.com>
62     -Date: Fri Jul 14 12:29:46 2017 +0200
63     -
64     - Cleanups in shares php pool templates
65     -
66     -commit daef899874a722f44afc13fc95e021670923a686
67     -Author: Daniel Berteaud <daniel@firewall-services.com>
68     -Date: Fri Jul 14 12:23:57 2017 +0200
69     -
70     - Add possibility to define custom PHP pools
71     -
72     -commit 10eb0f65519515656b16af70db59136101abcaa4
73     -Author: Daniel Berteaud <daniel@firewall-services.com>
74     -Date: Wed Jul 12 18:57:35 2017 +0200
75     -
76     - Fix template-begin link
77     -
78     -commit 198231fb458310f5f5f2a917818fd8c80132faa3
79     -Author: Daniel Berteaud <daniel@firewall-services.com>
80     -Date: Wed Jul 12 18:55:21 2017 +0200
81     -
82     - Replace logrotate conf with templates
83     -
84     -commit 986e7b9ea7365d878a999f3b176244fb69c903f9
85     -Author: Daniel Berteaud <daniel@firewall-services.com>
86     -Date: Wed Jul 12 18:38:29 2017 +0200
87     -
88     - Add a logrotate conf for php-fpm logs
89     -
90     -commit 6f64cb8c3f1fd9e82d2c2477d7f01c8c526671fb
91     -Author: Daniel Berteaud <daniel@firewall-services.com>
92     -Date: Wed Jul 12 18:26:36 2017 +0200
93     -
94     - run tmpwatch for PHP temp dir
95     -
96     -commit fc4d59c64b6abbcb62d65e16a148ceaf9950fa60
97     -Author: Daniel Berteaud <daniel@firewall-services.com>
98     -Date: Wed Jul 12 12:17:50 2017 +0200
99     -
100     - Fixes in php-pool-dirs action script
101     -
102     -commit 9895db690f645d1710ad4a4195c64fbd14324403
103     -Author: Daniel Berteaud <daniel@firewall-services.com>
104     -Date: Wed Jul 12 10:16:53 2017 +0200
105     -
106     - Reload services and expand-template when modifying shares
107     -
108     -commit f88b75fbe02581da270a5ab4488691ce8c0f3f50
109     -Author: Daniel Berteaud <daniel@firewall-services.com>
110     -Date: Wed Jul 12 10:13:16 2017 +0200
111     -
112     - Reload fpm services, no need to restart
113     -
114     -commit aa37d930f807a79c7ee421227aa597239ccc7137
115     -Author: Daniel Berteaud <daniel@firewall-services.com>
116     -Date: Tue Jul 11 19:57:10 2017 +0200
117     -
118     - Fix shares pool template path for php56
119     -
120     -commit c1450e94f70804a9669265e48f25fd0e47d4410f
121     -Author: Daniel Berteaud <daniel@firewall-services.com>
122     -Date: Tue Jul 11 19:03:24 2017 +0200
123     -
124     - Remove the adjust service action script
125     - Instead makes sure there's no socket conflict by simply prepending the PHP version to the socket name
126     -
127     -commit bd62c565c02e0ae21374e100e8e007e6451159c0
128     -Author: Daniel Berteaud <daniel@firewall-services.com>
129     -Date: Sun Jul 9 22:13:51 2017 +0200
130     -
131     - Various fixes in pools templates
132     -
133     -commit 3e21f2eaabf32d64eb2ba2f386f3ab5b203d93d9
134     -Author: Daniel Berteaud <daniel@firewall-services.com>
135     -Date: Sun Jul 9 22:01:11 2017 +0200
136     -
137     - Fix PIDFILE for php71
138     -
139     -commit a3402637bc7731420cbc6b65cb46ce96ae3cdde3
140     -Author: Daniel Berteaud <daniel@firewall-services.com>
141     -Date: Sun Jul 9 21:53:39 2017 +0200
142     -
143     - Env files mustn't use templaet-begin-ini
144     -
145     -commit 7d52484a4f90d835e25a2f610cfe08960b81e4fc
146     -Author: Daniel Berteaud <daniel@firewall-services.com>
147     -Date: Sun Jul 9 21:48:26 2017 +0200
148     -
149     - Fixes in adjust-php-fpm-services
150     -
151     -commit d6b14adfc842a7a2e0bc34d0fff61b107495362e
152     -Author: Daniel Berteaud <daniel@firewall-services.com>
153     -Date: Sun Jul 9 21:43:57 2017 +0200
154     -
155     - Set PIDFILE so services can be stopped
156     -
157     -commit b76293809ce23179935506e94b1f51dd26595730
158     -Author: Daniel Berteaud <daniel@firewall-services.com>
159     -Date: Sun Jul 9 21:26:06 2017 +0200
160     -
161     - Add a action acript to handle FPM restarts
162     -
163     -commit 98a234d6f6f7789d8face7e7259fdcd59f6c708e
164     -Author: Daniel Berteaud <daniel@firewall-services.com>
165     -Date: Sun Jul 9 21:06:29 2017 +0200
166     -
167     - templates-default and not template-default
168     -
169     -commit bfdabe4b1bd15df3aab2d7053de6060bbe80198f
170     -Author: Daniel Berteaud <daniel@firewall-services.com>
171     -Date: Sun Jul 9 21:04:29 2017 +0200
172     -
173     - Fix double $ in var name
174     -
175     -commit a282212291a960040fd16113ef21d221dc729265
176     -Author: Daniel Berteaud <daniel@firewall-services.com>
177     -Date: Sun Jul 9 20:55:40 2017 +0200
178     -
179     - Fix template-begin links
180     -
181     -commit 17cf6724ee85725826ce0d5281745d23d662ebfb
182     -Author: Daniel Berteaud <daniel@firewall-services.com>
183     -Date: Sat Jul 8 12:22:57 2017 +0200
184     -
185     - No # allowed for comment in php conf since php 7
186     -
187     -commit 440227bf348b3a15676c30fccc677beae4e46b9e
188     -Author: Daniel Berteaud <daniel@firewall-services.com>
189     -Date: Sat Jul 8 12:12:20 2017 +0200
190     -
191     - Add default DB entry for php70-php-fpm and php71-php-fpm
192     -
193     -commit 12527c1508a2484f9a288c1f9021690f16c15a4a
194     -Author: Daniel Berteaud <daniel@firewall-services.com>
195     -Date: Sat Jul 8 12:06:14 2017 +0200
196     -
197     - Makes sure we remove php pool dirs on share delete
198     -
199     -commit 9649dd42228f0f2fdaf26948a96b014a190f9c56
200     -Author: Daniel Berteaud <daniel@firewall-services.com>
201     -Date: Sat Jul 8 12:05:32 2017 +0200
202     -
203     - Add a script to create and delete php pool dirs
204     -
205     -commit c793cdef93755c21176504ae3f778be9f2c2580b
206     -Author: Daniel Berteaud <daniel@firewall-services.com>
207     -Date: Sat Jul 8 11:44:16 2017 +0200
208     -
209     - Fixes and cleanup in shares template
210     -
211     -commit 9ac0ec6917d6bac14667e7eaa66539d28621acd3
212     -Author: Daniel Berteaud <daniel@firewall-services.com>
213     -Date: Sat Jul 8 11:36:16 2017 +0200
214     -
215     - templates.metadata for shares pools must be independant from www.conf
216     -
217     -commit d73eb21445c43eb3a980cc51f0d2c68c67864f22
218     -Author: Daniel Berteaud <daniel@firewall-services.com>
219     -Date: Sat Jul 8 11:15:51 2017 +0200
220     -
221     - Expand templates for shares PHP FPM pools config
222     -
223     -commit 0a70b24010868c7390e43c799c25f3b5948c311c
224     -Author: Daniel Berteaud <daniel@firewall-services.com>
225     -Date: Sat Jul 8 11:10:09 2017 +0200
226     -
227     - Remove useless FPM_POOL_DIR from pools MORE_DATA
228     -
229     -commit c6275f4299cf239b6476411cde1bfb9da7302dde
230     -Author: Daniel Berteaud <daniel@firewall-services.com>
231     -Date: Sat Jul 8 11:03:03 2017 +0200
232     -
233     - Create one PHP FPM pool per shared folder
234     -
235     -commit 9c59939401c8a9ba435a3c4bf8f58d4a3cde5bbd
236     -Author: Daniel Berteaud <daniel@firewall-services.com>
237     -Date: Thu Jul 6 19:15:14 2017 +0200
238     -
239     - Add support for PHP 7.0 and PHP 7.1
240     -
241     -commit 6b94210616165a0f63b86bbd42f2803b840b4eca
242     -Author: Daniel Berteaud <daniel@firewall-services.com>
243     -Date: Thu Jul 6 19:13:22 2017 +0200
244     -
245     - Fix in spec file
246     -
247     -commit 998315223b95ccf4ce58fd3ae168aeb5adfadf69
248     -Author: Daniel Berteaud <daniel@firewall-services.com>
249     -Date: Thu Jul 6 19:10:51 2017 +0200
250     -
251     - Remove useless PID_DIR from MORE_DATA
252     -
253     -commit 2e76904ff8126f46efb98c219acbbe6106469c47
254     -Author: Daniel Berteaud <daniel@firewall-services.com>
255     -Date: Thu Jul 6 19:04:55 2017 +0200
256     -
257     - Allow complete access to the dummy location for php-cgi handlers
258     -
259     -commit f950348e8aef7b5a4216a88222f1bfff65405e76
260     -Author: Daniel Berteaud <daniel@firewall-services.com>
261     -Date: Thu Jul 6 18:40:22 2017 +0200
262     -
263     - Adapt to work with mod_fastcgi or mod_proxy_fcgi
264     -
265     -commit c01d59f5238e6fbffeff4212651a2cd2658457b8
266     -Author: Daniel Berteaud <daniel@firewall-services.com>
267     -Date: Thu Jul 6 18:13:46 2017 +0200
268     -
269     - Conditionaly load mod_proxy_fcgi or mod_fastcgi
270     -
271     -commit 4c0439a2a8fe914dce98869e0db2e218ad84c238
272     -Author: Daniel Berteaud <daniel@firewall-services.com>
273     -Date: Wed Jul 5 23:08:13 2017 +0200
274     -
275     - Ensure each php-fpm master uses a different PID file
276     -
277     -commit e4668215ad8b3e76b102afa699e165e11012e1b9
278     -Author: Daniel Berteaud <daniel@firewall-services.com>
279     -Date: Wed Jul 5 23:03:08 2017 +0200
280     -
281     - Remove useless $PID_DIR from MORE_DATA
282     -
283     -commit 7a2476785e632c06db61b10d97abfdb4a7417e37
284     -Author: Daniel Berteaud <daniel@firewall-services.com>
285     -Date: Wed Jul 5 23:02:48 2017 +0200
286     -
287     - Add templates metadata for stock php-fpm.d/www.conf
288     -
289     -commit 52ee545b25763697b6c70d1a6aefce12b6ca767a
290     -Author: Daniel Berteaud <daniel@firewall-services.com>
291     -Date: Wed Jul 5 23:01:03 2017 +0200
292     -
293     - Add template metadata for stock php-fpm.conf
294     -
295     -commit 0ab3ca30c9b1882d76b2f963f037b0d5a09af9ca
296     -Author: Daniel Berteaud <daniel@firewall-services.com>
297     -Date: Wed Jul 5 23:00:35 2017 +0200
298     -
299     - Move defaults DB entry in their correct dir
300     -
301     -commit 7d8410f63ca4ac8761f86aaba1382bdd9e43c1e7
302     -Author: Daniel Berteaud <daniel@firewall-services.com>
303     -Date: Wed Jul 5 22:48:19 2017 +0200
304     -
305     - Add links to start default php-fpm service
306     -
307     -commit 689f207cbe1e594f4d2c400f1db33e30716b41a1
308     -Author: Daniel Berteaud <daniel@firewall-services.com>
309     -Date: Wed Jul 5 22:46:05 2017 +0200
310     -
311     - Add default DB entry for stock php-fpm service
312     -
313     -commit 73615c326bdf8c377428781449225de16b449de2
314     -Author: Daniel Berteaud <daniel@firewall-services.com>
315     -Date: Wed Jul 5 22:43:57 2017 +0200
316     -
317     - Support empty $PHP_VERSION for default php-fpm service
318     -
319     -commit b9b738be0613933f1e77370e4f1860e589084a17
320     -Author: Daniel Berteaud <daniel@firewall-services.com>
321     -Date: Wed Jul 5 22:42:14 2017 +0200
322     -
323     - Put PID in global /var/run/php-fpm dir
324     -
325     -commit e4f19a7defe934489d221efba609d4d1476fe089
326     -Author: Daniel Berteaud <daniel@firewall-services.com>
327     -Date: Wed Jul 5 22:35:31 2017 +0200
328     -
329     - Add links to start php56-php-fpm service
330     - And templates expension
331     -
332     -commit 27448561e2c1ce008a1e2667aa143753a2ec9df6
333     -Author: Daniel Berteaud <daniel@firewall-services.com>
334     -Date: Wed Jul 5 22:29:45 2017 +0200
335     -
336     - Use php56-php-fpm entry to get conf instead of php56
337     -
338     -commit 69e1a214d0f7c37682379fc0919c2a2fdcd13fec
339     -Author: Daniel Berteaud <daniel@firewall-services.com>
340     -Date: Wed Jul 5 22:29:30 2017 +0200
341     -
342     - Add service entry for php56-php-fpm
343     -
344     -commit a3c773364f305f3b4da2a06bb79cec8ec82c7726
345     -Author: Daniel Berteaud <daniel@firewall-services.com>
346     -Date: Wed Jul 5 22:19:53 2017 +0200
347     -
348     - Load mod_proxy_fcgi
349     -
350     -commit 2ae809f147d493eee8a13b00c7d9015c1a57d046
351     -Author: Daniel Berteaud <daniel@firewall-services.com>
352     -Date: Wed Jul 5 10:26:10 2017 +0200
353     -
354     - Set default disabled functions
355     -
356     -commit 77ffc47f4c839c76a6d8610a8f65eea95e218175
357     -Author: Daniel Berteaud <daniel@firewall-services.com>
358     -Date: Tue Jul 4 23:13:13 2017 +0200
359     -
360     - Add php56 deps and create needed directories
361     -
362     -commit 3cff192c10ce28f13b28510ae6b7db458050ad72
363     -Author: Daniel Berteaud <daniel@firewall-services.com>
364     -Date: Tue Jul 4 22:53:42 2017 +0200
365     -
366     - Read defalt pool settings from the DB
367     -
368     -commit 9d5481ddfb4d94920454cfef95f0f35a1c3aafb5
369     -Author: Daniel Berteaud <daniel@firewall-services.com>
370     -Date: Tue Jul 4 22:53:13 2017 +0200
371     -
372     - Fix templates.metadata for fpm pools
373     -
374     -commit 1997dd3bcbb5dcd7d897b7beb183a06de23a3209
375     -Author: Daniel Berteaud <daniel@firewall-services.com>
376     -Date: Sun Jul 2 23:10:24 2017 +0200
377     -
378     - Add templates for default PHP pool
379     -
380     -commit a0018ed841eb3ea7cb6b152e5fbe1e6a162d5424
381     -Author: Daniel Berteaud <daniel@firewall-services.com>
382     -Date: Sun Jul 2 14:19:48 2017 +0200
383     -
384     - First commit
385     diff -Nur smeserver-php-fpm-0.1.1.old/createlinks smeserver-php-fpm-0.1.1/createlinks
386     --- smeserver-php-fpm-0.1.1.old/createlinks 2017-07-27 18:05:00.000000000 +0200
387     +++ smeserver-php-fpm-0.1.1/createlinks 2019-12-16 19:54:02.827363588 +0100
388     @@ -2,7 +2,7 @@
389    
390     use esmith::Build::CreateLinks qw(:all);
391    
392     -foreach my $service (qw(php-fpm php56-php-fpm php70-php-fpm php71-php-fpm)){
393     +foreach my $service (qw(php-fpm php56-php-fpm php70-php-fpm php71-php-fpm php72-php-fpm php73-php-fpm)){
394     service_link_enhanced($service, "S86", "7");
395     service_link_enhanced($service, "K16", "6");
396     service_link_enhanced($service, "K16", "0");
397     @@ -27,7 +27,15 @@
398     /etc/opt/remi/php71/php-fpm.conf
399     /etc/opt/remi/php71/php-fpm.d/www.conf
400     /etc/opt/remi/php71/php-fpm.d/shares.conf
401     - /etc/opt/remi/php71/php-fpm.d/custom.conf ){
402     + /etc/opt/remi/php71/php-fpm.d/custom.conf
403     + /etc/opt/remi/php72/php-fpm.conf
404     + /etc/opt/remi/php72/php-fpm.d/www.conf
405     + /etc/opt/remi/php72/php-fpm.d/shares.conf
406     + /etc/opt/remi/php72/php-fpm.d/custom.conf
407     + /etc/opt/remi/php73/php-fpm.conf
408     + /etc/opt/remi/php73/php-fpm.d/www.conf
409     + /etc/opt/remi/php73/php-fpm.d/shares.conf
410     + /etc/opt/remi/php73/php-fpm.d/custom.conf){
411     templates2events($file, qw(webapps-update bootstrap-console-save share-create share-modify share-modify-server share-delete));
412     safe_symlink('/etc/e-smith/templates-default/template-begin-ini', "root/etc/e-smith/templates$file/template-begin");
413     }
414     @@ -38,6 +46,8 @@
415     /opt/remi/php56/root/etc/sysconfig/php-fpm
416     /etc/opt/remi/php70/sysconfig/php-fpm
417     /etc/opt/remi/php71/sysconfig/php-fpm
418     + /etc/opt/remi/php72/sysconfig/php-fpm
419     + /etc/opt/remi/php73/sysconfig/php-fpm
420     /etc/logrotate.d/php-fpm ){
421     templates2events($file, qw(webapps-update bootstrap-console-save));
422     }
423     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults
424     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2017-07-27 18:05:00.000000000 +0200
425     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/10Defaults 2019-12-16 19:51:05.387361636 +0100
426     @@ -1,5 +1,5 @@
427    
428     -for VER in php php56 php70 php71; do
429     +for VER in php php56 php70 php71 php72 php73; do
430     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/tmp
431     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/opcache
432     /usr/sbin/tmpwatch -umc --nodirs -q 7d /var/lib/php/$VER/wsdlcache
433     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig
434     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig 2017-07-27 18:05:00.000000000 +0200
435     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/68FastCGIConfig 2019-12-16 19:50:36.887360748 +0100
436     @@ -17,7 +17,7 @@
437    
438     _EOF
439    
440     - foreach my $ver ('', '56', '70', '71'){
441     + foreach my $ver ('', '56', '70', '71', '72', '73'){
442     $OUT .=<<_EOF;
443    
444     Action php$ver-fastcgi /php-cgi-bin/php$ver-wrapper
445     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm
446     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2017-07-27 18:05:00.000000000 +0200
447     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2019-12-16 19:51:35.599362570 +0100
448     @@ -8,5 +8,7 @@
449     /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true
450     /sbin/e-smith/service php70-php-fpm reload >/dev/null 2>&1 || true
451     /sbin/e-smith/service php71-php-fpm reload >/dev/null 2>&1 || true
452     + /sbin/e-smith/service php72-php-fpm reload >/dev/null 2>&1 || true
453     + /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true
454     endscript
455     \}
456     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf
457     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf 1970-01-01 01:00:00.000000000 +0100
458     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.conf 2019-12-16 19:46:37.302353030 +0100
459     @@ -0,0 +1,2 @@
460     +TEMPLATE_PATH="/etc/php-fpm.conf"
461     +MORE_DATA={ PHP_VERSION => 72, FPM_POOL_DIR => "/etc/opt/remi/php72/php-fpm.d" }
462     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf
463     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf 1970-01-01 01:00:00.000000000 +0100
464     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/custom.conf 2019-12-16 19:47:20.872354468 +0100
465     @@ -0,0 +1,2 @@
466     +TEMPLATE_PATH="/etc/php-fpm.d/custom.conf"
467     +MORE_DATA={ PHP_VERSION => 72 }
468     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf
469     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf 1970-01-01 01:00:00.000000000 +0100
470     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf 2019-12-16 19:46:53.509353567 +0100
471     @@ -0,0 +1,2 @@
472     +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf"
473     +MORE_DATA={ PHP_VERSION => 72 }
474     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf
475     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf 1970-01-01 01:00:00.000000000 +0100
476     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/www.conf 2019-12-16 19:47:07.145354018 +0100
477     @@ -0,0 +1,2 @@
478     +TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
479     +MORE_DATA={ PHP_VERSION => 72 }
480     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm
481     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm 1970-01-01 01:00:00.000000000 +0100
482     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/sysconfig/php-fpm 2019-12-16 19:47:33.994354899 +0100
483     @@ -0,0 +1,2 @@
484     +TEMPLATE_PATH="/etc/sysconfig/php-fpm"
485     +MORE_DATA={ PHP_VERSION => 72 }
486     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf
487     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf 1970-01-01 01:00:00.000000000 +0100
488     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.conf 2019-12-16 19:48:05.336355919 +0100
489     @@ -0,0 +1,2 @@
490     +TEMPLATE_PATH="/etc/php-fpm.conf"
491     +MORE_DATA={ PHP_VERSION => 73, FPM_POOL_DIR => "/etc/opt/remi/php73/php-fpm.d" }
492     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf
493     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf 1970-01-01 01:00:00.000000000 +0100
494     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/custom.conf 2019-12-16 19:48:44.804357194 +0100
495     @@ -0,0 +1,2 @@
496     +TEMPLATE_PATH="/etc/php-fpm.d/custom.conf"
497     +MORE_DATA={ PHP_VERSION => 73 }
498     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf
499     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf 1970-01-01 01:00:00.000000000 +0100
500     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf 2019-12-16 19:48:23.431356505 +0100
501     @@ -0,0 +1,2 @@
502     +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf"
503     +MORE_DATA={ PHP_VERSION => 73 }
504     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf
505     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf 1970-01-01 01:00:00.000000000 +0100
506     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/www.conf 2019-12-16 19:48:34.980356878 +0100
507     @@ -0,0 +1,2 @@
508     +TEMPLATE_PATH="/etc/php-fpm.d/www.conf"
509     +MORE_DATA={ PHP_VERSION => 73 }
510     diff -Nur smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm
511     --- smeserver-php-fpm-0.1.1.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm 1970-01-01 01:00:00.000000000 +0100
512     +++ smeserver-php-fpm-0.1.1/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/sysconfig/php-fpm 2019-12-16 19:48:54.575357511 +0100
513     @@ -0,0 +1,2 @@
514     +TEMPLATE_PATH="/etc/sysconfig/php-fpm"
515     +MORE_DATA={ PHP_VERSION => 73 }
516     diff -Nur smeserver-php-fpm-0.1.1.old/smeserver-php-fpm.spec smeserver-php-fpm-0.1.1/smeserver-php-fpm.spec
517     --- smeserver-php-fpm-0.1.1.old/smeserver-php-fpm.spec 2017-07-27 18:05:00.000000000 +0200
518     +++ smeserver-php-fpm-0.1.1/smeserver-php-fpm.spec 1970-01-01 01:00:00.000000000 +0100
519     @@ -1,167 +0,0 @@
520     -%define version 0.1.0
521     -%define release 1
522     -%define name smeserver-php-fpm
523     -
524     -
525     -Summary: PHP FPM pools on SME Server
526     -Name: %{name}
527     -Version: %{version}
528     -Release: %{release}%{?dist}
529     -License: MIT
530     -Group: Applications/System
531     -Source: %{name}-%{version}.tar.gz
532     -
533     -BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
534     -BuildArch: x86_64
535     -BuildRequires: e-smith-devtools
536     -
537     -Requires: e-smith-base >= 5.6.0
538     -
539     -# On el7 we can use mod_proxy_fcgi instead
540     -%if 0%{?rhel} <= 7
541     -Requires: mod_fastcgi
542     -%endif
543     -
544     -Requires: tmpwatch
545     -Requires: logrotate
546     -
547     -# Stock PHP
548     -Requires: php-cli
549     -Requires: php-ldap
550     -Requires: php-imap
551     -Requires: php-gd
552     -Requires: php-xml
553     -Requires: php-xmlrpc
554     -Requires: php-soap
555     -Requires: php-opcache
556     -Requires: php-fpm
557     -Requires: php-mbstring
558     -Requires: php-mysql
559     -Requires: php-json
560     -Requires: php-bcmath
561     -Requires: php-intl
562     -Requires: php-mcrypt
563     -Requires: php-pear
564     -Requires: php-process
565     -Requires: php-snmp
566     -
567     -# PHP 5.6
568     -Requires: php56-php-cli
569     -Requires: php56-php-ldap
570     -Requires: php56-php-imap
571     -Requires: php56-php-gd
572     -Requires: php56-php-xml
573     -Requires: php56-php-xmlrpc
574     -Requires: php56-php-soap
575     -Requires: php56-php-opcache
576     -Requires: php56-php-fpm
577     -Requires: php56-php-mbstring
578     -Requires: php56-php-mysql
579     -Requires: php56-php-json
580     -Requires: php56-php-bcmath
581     -Requires: php56-php-intl
582     -Requires: php56-php-mcrypt
583     -Requires: php56-php-pear
584     -Requires: php56-php-process
585     -Requires: php56-php-snmp
586     -
587     -# PHP 7.0
588     -Requires: php70-php-cli
589     -Requires: php70-php-ldap
590     -Requires: php70-php-imap
591     -Requires: php70-php-gd
592     -Requires: php70-php-xml
593     -Requires: php70-php-xmlrpc
594     -Requires: php70-php-soap
595     -Requires: php70-php-opcache
596     -Requires: php70-php-fpm
597     -Requires: php70-php-mbstring
598     -Requires: php70-php-mysql
599     -Requires: php70-php-json
600     -Requires: php70-php-bcmath
601     -Requires: php70-php-intl
602     -Requires: php70-php-mcrypt
603     -Requires: php70-php-pear
604     -Requires: php70-php-process
605     -Requires: php70-php-snmp
606     -
607     -# PHP 7.1
608     -Requires: php71-php-cli
609     -Requires: php71-php-ldap
610     -Requires: php71-php-imap
611     -Requires: php71-php-gd
612     -Requires: php71-php-xml
613     -Requires: php71-php-xmlrpc
614     -Requires: php71-php-soap
615     -Requires: php71-php-opcache
616     -Requires: php71-php-fpm
617     -Requires: php71-php-mbstring
618     -Requires: php71-php-mysql
619     -Requires: php71-php-json
620     -Requires: php71-php-bcmath
621     -Requires: php71-php-intl
622     -Requires: php71-php-mcrypt
623     -Requires: php71-php-pear
624     -Requires: php71-php-process
625     -Requires: php71-php-snmp
626     -
627     -%description
628     -Manage PHP FPM pools, and switch between PHP versions easily
629     -
630     -%prep
631     -%setup -q -n %{name}-%{version}
632     -
633     -%build
634     -perl createlinks
635     -%{__mkdir_p} root/var/www/php-cgi-bin/
636     -%{__mkdir_p} root/var/log/php/php/
637     -%{__mkdir_p} root/var/lib/php/php/{session,tmp,opcache,wsdlcache}
638     -%{__mkdir_p} root/var/log/php/php56/
639     -%{__mkdir_p} root/var/lib/php/php56/{session,tmp,opcache,wsdlcache}
640     -%{__mkdir_p} root/var/log/php/php70/
641     -%{__mkdir_p} root/var/lib/php/php70/{session,tmp,opcache,wsdlcache}
642     -%{__mkdir_p} root/var/log/php/php71/
643     -%{__mkdir_p} root/var/lib/php/php71/{session,tmp,opcache,wsdlcache}
644     -
645     -%install
646     -/bin/rm -rf $RPM_BUILD_ROOT
647     -(cd root; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
648     -/bin/rm -f %{name}-%{version}-filelist
649     -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
650     - --dir /var/log/php/php/ 'attr(0770,root,www)' \
651     - --dir /var/lib/php/php/session 'attr(0770,root,www)' \
652     - --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \
653     - --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \
654     - --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \
655     - --dir /var/log/php/php56/ 'attr(0770,root,www)' \
656     - --dir /var/lib/php/php56/session 'attr(0770,root,www)' \
657     - --dir /var/lib/php/php56/tmp 'attr(0770,root,www)' \
658     - --dir /var/lib/php/php56/opcache 'attr(0770,root,www)' \
659     - --dir /var/lib/php/php56/wsdlcache 'attr(0770,root,www)' \
660     - --dir /var/log/php/php70/ 'attr(0770,root,www)' \
661     - --dir /var/lib/php/php70/session 'attr(0770,root,www)' \
662     - --dir /var/lib/php/php70/tmp 'attr(0770,root,www)' \
663     - --dir /var/lib/php/php70/opcache 'attr(0770,root,www)' \
664     - --dir /var/lib/php/php70/wsdlcache 'attr(0770,root,www)' \
665     - --dir /var/log/php/php71/ 'attr(0770,root,www)' \
666     - --dir /var/lib/php/php71/session 'attr(0770,root,www)' \
667     - --dir /var/lib/php/php71/tmp 'attr(0770,root,www)' \
668     - --dir /var/lib/php/php71/opcache 'attr(0770,root,www)' \
669     - --dir /var/lib/php/php71/wsdlcache 'attr(0770,root,www)' \
670     - > %{name}-%{version}-filelist
671     -
672     -%clean
673     -rm -rf $RPM_BUILD_ROOT
674     -
675     -%files -f %{name}-%{version}-filelist
676     -%defattr(-,root,root)
677     -
678     -%pre
679     -
680     -%post
681     -
682     -%preun
683     -
684     -%changelog
685     -* Wed Jul 26 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.1.0-1.sme
686     -- Initial release

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed