/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-fpm-0.1.1-bz10877-pool-logs.patch
ViewVC logotype

Annotation of /rpms/smeserver-php/sme10/smeserver-php-fpm-0.1.1-bz10877-pool-logs.patch

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

Revision 1.1 - (hide annotations) (download)
Mon Mar 9 16:57:16 2020 UTC (4 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-php-3_0_0-20_el7_sme, smeserver-php-3_0_0-44_el7_sme, smeserver-php-3_0_0-47_el7_sme, smeserver-php-3_0_0-7_el7_sme, smeserver-php-3_0_0-12_el7_sme, smeserver-php-3_0_0-22_el7_sme, smeserver-php-3_0_0-31_el7_sme, smeserver-php-3_0_0-25_el7_sme, smeserver-php-3_0_0-28_el7_sme, smeserver-php-3_0_0-45_el7_sme, smeserver-php-3_0_0-48_el7_sme, smeserver-php-3_0_0-11_el7_sme, smeserver-php-3_0_0-6_el7_sme, smeserver-php-3_0_0-10_el7_sme, smeserver-php-3_0_0-43_el7_sme, smeserver-php-3_0_0-46_el7_sme, smeserver-php-3_0_0-41_el7_sme, smeserver-php-3_0_0-30_el7_sme, smeserver-php-3_0_0-29_el7_sme, smeserver-php-3_0_0-4_el7_sme, smeserver-php-3_0_0-42_el7_sme, smeserver-php-3_0_0-5_el7_sme, smeserver-php-3_0_0-21_el7_sme, smeserver-php-3_0_0-24_el7_sme, smeserver-php-3_0_0-34_el7_sme, smeserver-php-3_0_0-3_el7_sme, smeserver-php-3_0_0-37_el7_sme, smeserver-php-3_0_0-40_el7_sme, smeserver-php-3_0_0-9_el7_sme, smeserver-php-3_0_0-18_el7_sme, smeserver-php-3_0_0-15_el7_sme, smeserver-php-3_0_0-8_el7_sme, smeserver-php-3_0_0-35_el7_sme, smeserver-php-3_0_0-26_el7_sme, smeserver-php-3_0_0-32_el7_sme, smeserver-php-3_0_0-17_el7_sme, smeserver-php-3_0_0-14_el7_sme, smeserver-php-3_0_0-16_el7_sme, smeserver-php-3_0_0-13_el7_sme, smeserver-php-3_0_0-38_el7_sme, smeserver-php-3_0_0-19_el7_sme, smeserver-php-3_0_0-27_el7_sme, smeserver-php-3_0_0-39_el7_sme, smeserver-php-3_0_0-36_el7_sme, smeserver-php-3_0_0-33_el7_sme, smeserver-php-3_0_0-23_el7_sme, HEAD 
* Mon Mar 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-3.sme
- fix typos and logic in scripts [SME: 10335]
- only set php admin values if php module is enabled [SME: 10871]
- redirect php*-php-fpm services logs to /var/log/php/php*/php-fpm.log [SME: 10879]
- pool logs in /var/log/php/*/error.log [SME: 10877]
1 jpp 1.1 diff -Nur smeserver-php-3.0.0.old/createlinks smeserver-php-3.0.0/createlinks
2     --- smeserver-php-3.0.0.old/createlinks 2020-01-28 13:54:44.000000000 -0500
3     +++ smeserver-php-3.0.0/createlinks 2020-03-09 12:52:00.414000000 -0400
4     @@ -79,5 +79,5 @@
5     safe_symlink('/etc/e-smith/templates-default/template-begin-shell', 'root/etc/e-smith/templates/etc/cron.daily/tmpwatch-php-fpm/template-begin');
6    
7     event_link("php-pool-dirs", qw(ibay-create ibay-delete ibay-modify ibay-modify-files ibay-modify-servers smeserver-php-update), "90");
8     -
9     +event_link("php-pool-customs", qw(ibay-create ibay-delete ibay-modify ibay-modify-files ibay-modify-servers smeserver-php-update console-save post-upgrade post-install), "90");
10    
11     diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/events/actions/php-pool-customs smeserver-php-3.0.0/root/etc/e-smith/events/actions/php-pool-customs
12     --- smeserver-php-3.0.0.old/root/etc/e-smith/events/actions/php-pool-customs 1969-12-31 19:00:00.000000000 -0500
13     +++ smeserver-php-3.0.0/root/etc/e-smith/events/actions/php-pool-customs 2020-03-09 12:49:03.372000000 -0400
14     @@ -0,0 +1,24 @@
15     +#!/usr/bin/perl -w
16     +
17     +use strict;
18     +use warnings;
19     +use File::Path qw(make_path remove_tree);
20     +use esmith::ConfigDB;
21     +
22     +my $pool_db = esmith::ConfigDB->open_ro('php') || esmith::ConfigDB->create('php');
23     +
24     +foreach my $pool ($pool_db->get_all_by_prop(type => 'pool')){
25     + my $status = $pool->prop('status') || 'enabled';
26     + next unless ($status eq 'enabled');
27     + my $key = $pool->key;
28     + my @dirs = ( "/var/log/php/$key",
29     + "/var/lib/php/$key/session",
30     + "/var/lib/php/$key/wsdlcache",
31     + "/var/lib/php/$key/opcache",
32     + "/var/lib/php/$key/tmp" );
33     + make_path( @dirs, {
34     + owner => 'root',
35     + group => 'www'
36     + });
37     + chmod 0770, @dirs;
38     +}
39     diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All
40     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All 2017-07-27 12:05:00.000000000 -0400
41     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/custom.conf/10All 2020-03-09 12:44:24.363000000 -0400
42     @@ -57,11 +57,10 @@
43     php_admin_value[session.save_path] = /var/lib/php/$key/session
44     php_admin_value[opcache.file_cache] = /var/lib/php/$key/opcache
45     php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp
46     -php_admin_value[error_log] = /var/log/php/$key/error.log
47     php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
48     php_admin_flag[display_errors] = $display_errors
49     php_admin_flag[log_errors] = $log_errors
50     -php_admin_value[error_log] = syslog
51     +php_admin_value[error_log] = /var/log/php/$key/error.log
52     php_admin_value[memory_limit] = $memory_limit
53     php_admin_value[max_execution_time] = $max_execution_time
54     php_admin_value[post_max_size] = $post_max_size
55     diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays
56     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2020-01-28 13:47:06.000000000 -0500
57     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/ibays.conf/10Ibays 2020-03-09 12:44:50.061000000 -0400
58     @@ -51,11 +51,10 @@
59     php_admin_value[session.save_path] = /var/lib/php/$key/session
60     php_admin_value[opcache.file_cache] = /var/lib/php/$key/opcache
61     php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp
62     -php_admin_value[error_log] = /var/log/php/$key/error.log
63     php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
64     php_admin_flag[display_errors] = off
65     php_admin_flag[log_errors] = on
66     -php_admin_value[error_log] = syslog
67     +php_admin_value[error_log] = /var/log/php/$key/error.log
68     php_admin_value[memory_limit] = $memory_limit
69     php_admin_value[max_execution_time] = $max_execution_time
70     php_admin_value[post_max_size] = $post_max_size
71     diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings
72     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings 2017-07-27 12:05:00.000000000 -0400
73     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/00Default50Settings 2020-03-09 12:46:45.816000000 -0400
74     @@ -1,7 +1,6 @@
75     php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName }
76     php_admin_flag[display_errors] = off
77     php_admin_flag[log_errors] = on
78     -php_admin_value[error_log] = syslog
79     php_admin_value[memory_limit] = { $MemoryLimit }
80     php_admin_value[max_execution_time] = { $MaxExecutionTime }
81     php_admin_value[post_max_size] = { $PostMaxSize }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed