/[smecontribs]/rpms/smeserver-shared-folders/contribs10/smeserver-shared-folders-0.3-bz11523-php-fpm.patch
ViewVC logotype

Diff of /rpms/smeserver-shared-folders/contribs10/smeserver-shared-folders-0.3-bz11523-php-fpm.patch

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

Revision 1.1 by jpp, Mon Jul 25 05:35:33 2022 UTC Revision 1.2 by jpp, Mon Jul 25 06:01:51 2022 UTC
# Line 34  diff -Nur --no-dereference smeserver-sha Line 34  diff -Nur --no-dereference smeserver-sha
34  +event_link("php-pool-dirs", "share-modify-server", "90");  +event_link("php-pool-dirs", "share-modify-server", "90");
35  +event_link("php-pool-dirs", "share-delete", "90");  +event_link("php-pool-dirs", "share-delete", "90");
36  +  +
37    diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares
38    --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares       2022-07-25 01:14:56.310000000 -0400
39    +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares   2022-07-25 02:00:18.927000000 -0400
40    @@ -124,7 +124,7 @@
41                     $OUT .= '    AddHandler php' . $key . '-fastcgi .php' . "\n";
42                 }
43                 elsif ($fastcgi_mod eq 'mod_proxy_fcgi'){
44    -                my $version = $properties{'PHPVersion'} || '';
45    +                my $version = $properties{'PHPVersion'} || '74';
46                     $OUT .=<<"_EOF";
47         <FilesMatch \.php\$>
48             SetHandler "proxy:unix:/var/run/php-fpm/php$version-$key.sock|fcgi://localhost"
49  diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares  diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares
50  --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares      1969-12-31 19:00:00.000000000 -0500  --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares      1969-12-31 19:00:00.000000000 -0500
51  +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares  2017-07-27 12:05:00.000000000 -0400  +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/php-fpm.d/shares.conf/10Shares  2022-07-25 01:59:49.751000000 -0400
52  @@ -0,0 +1,72 @@  @@ -0,0 +1,72 @@
53  +{  +{
54  +  +
# Line 44  diff -Nur --no-dereference smeserver-sha Line 56  diff -Nur --no-dereference smeserver-sha
56  +my $a = esmith::AccountsDB->open_ro || die "Couldn't open the accounts database";  +my $a = esmith::AccountsDB->open_ro || die "Couldn't open the accounts database";
57  +  +
58  +foreach my $share ($a->get_all_by_prop(type => 'share')){  +foreach my $share ($a->get_all_by_prop(type => 'share')){
59  +  my $version             = $share->prop('PHPVersion') || '';  +  my $version             = $share->prop('PHPVersion') || '74';
60  +  my $dynamic             = $share->prop('DynamicContent') || 'disabled';  +  my $dynamic             = $share->prop('DynamicContent') || 'disabled';
61  +  my $custom              = $share->prop('PHPCustomPool') || undef;  +  my $custom              = $share->prop('PHPCustomPool') || undef;
62  +  next unless ($dynamic eq 'enabled' && $version eq $PHP_VERSION && !$custom);  +  next unless ($dynamic eq 'enabled' && $version eq $PHP_VERSION && !$custom);

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed