/[smeserver]/rpms/smeserver-php/sme10/smeserver-php-fpm-0.1.1-bz10871-bz10335-fix1.patch
ViewVC logotype

Annotation of /rpms/smeserver-php/sme10/smeserver-php-fpm-0.1.1-bz10871-bz10335-fix1.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/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP
2     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP 2020-01-28 13:42:07.000000000 -0500
3     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80PHP 2020-03-09 12:21:57.798000000 -0400
4     @@ -1,7 +1,7 @@
5     {
6     $phpModule = $php{phpModule} || 'disabled';
7     # default we return with nothing activated
8     - return "#PHP mod is disabled by default, please use PHP-fpm" unless ((exists $php{status} and $php{status} eq "enabled") or $phpModule eq "disabled");
9     + return "#PHP mod is disabled by default, please use PHP-fpm" unless (exists $php{status} and $php{status} eq "enabled" and $phpModule eq "enabled");
10    
11     $PHPVersion = $php{'PHPVersion'} ||'73';
12     ($PHPVersion) = $PHPVersion =~ /([0-9]{2})/;
13     diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays
14     --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2020-03-09 12:18:46.733000000 -0400
15     +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2020-03-09 12:31:08.658000000 -0400
16     @@ -11,6 +11,7 @@
17     if ($dynamicContent eq 'enabled')
18     {
19     $OUT .= "\n<Directory /home/e-smith/files/ibays/" . $ibay->key . "/html>\n";
20     + # configuration to enable php-fpm for the ibay
21     if ($fastcgi_mod eq 'mod_proxy_fcgi')
22     {
23     my $version = $properties{'PHPVersion'} || $PHPVersion || '';
24     @@ -27,22 +28,26 @@
25     $OUT .= " AddType application/x-httpd-php .php .phtml\n";
26     $OUT .= " AddType application/x-httpd-php-source .phps\n";
27    
28     - # Set the upload_tmp_folder where php can upload files
29     - my $tmpdir = $ibay->prop('PHPTmpDir') || 'enabled';
30     - $tmpdir = ("/var/cache/e-smith/files/ibays/$key/tmp") if $tmpdir eq 'enabled';
31     - $OUT .= " php_admin_value upload_tmp_dir $tmpdir\n" unless ($tmpdir eq 'disabled' || ! -d $tmpdir);
32     + # the following block is only in case phpmodule is enabled.
33     + if (exists $php{status} and $php{status} eq "enabled" and $phpModule eq "enabled")
34     + {
35     + # Set the upload_tmp_folder where php can upload files
36     + my $tmpdir = $ibay->prop('PHPTmpDir') || 'enabled';
37     + $tmpdir = ("/var/cache/e-smith/files/ibays/$key/tmp") if $tmpdir eq 'enabled';
38     + $OUT .= " php_admin_value upload_tmp_dir $tmpdir\n" unless ($tmpdir eq 'disabled' || ! -d $tmpdir);
39    
40     - # Set the session folder where php can store its session instead of in global dir
41     - my $sessdir = $ibay->prop('PHPSessionDir') || 'enabled';
42     - $sessdir = ("/var/cache/e-smith/files/ibays/$key/session") if $sessdir eq 'enabled';
43     - $OUT .= " php_admin_value session.save_path $sessdir\n" unless ($sessdir eq 'disabled' || ! -d $sessdir);
44     + # Set the session folder where php can store its session instead of in global dir
45     + my $sessdir = $ibay->prop('PHPSessionDir') || 'enabled';
46     + $sessdir = ("/var/cache/e-smith/files/ibays/$key/session") if $sessdir eq 'enabled';
47     + $OUT .= " php_admin_value session.save_path $sessdir\n" unless ($sessdir eq 'disabled' || ! -d $sessdir);
48    
49     - # Set the sandbox within which PHP is confined to play
50     - my $basedir = $ibay->prop('PHPBaseDir')
51     - || ("/home/e-smith/files/ibays/$key/");
52     - $basedir = $tmpdir . ":" . $basedir unless ($tmpdir eq 'disabled' || ! -d $tmpdir);
53     - $basedir = $sessdir . ":" . $basedir unless ($sessdir eq 'disabled' || ! -d $sessdir);
54     - $OUT .= " php_admin_value open_basedir $basedir\n";
55     + # Set the sandbox within which PHP is confined to play
56     + my $basedir = $ibay->prop('PHPBaseDir')
57     + || ("/home/e-smith/files/ibays/$key/");
58     + $basedir = $tmpdir . ":" . $basedir unless ($tmpdir eq 'disabled' || ! -d $tmpdir);
59     + $basedir = $sessdir . ":" . $basedir unless ($sessdir eq 'disabled' || ! -d $sessdir);
60     + $OUT .= " php_admin_value open_basedir $basedir\n";
61     + }
62     }
63     $OUT .= "</Directory>\n";
64     }
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed