--- rpms/smeserver-shared-folders/contribs10/smeserver-shared-folders-0.3-bz11523-php-fpm.patch 2022/07/25 05:35:33 1.1 +++ rpms/smeserver-shared-folders/contribs10/smeserver-shared-folders-0.3-bz11523-php-fpm.patch 2022/07/25 06:01:51 1.2 @@ -34,9 +34,21 @@ diff -Nur --no-dereference smeserver-sha +event_link("php-pool-dirs", "share-modify-server", "90"); +event_link("php-pool-dirs", "share-delete", "90"); + +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 +--- 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 ++++ 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 +@@ -124,7 +124,7 @@ + $OUT .= ' AddHandler php' . $key . '-fastcgi .php' . "\n"; + } + elsif ($fastcgi_mod eq 'mod_proxy_fcgi'){ +- my $version = $properties{'PHPVersion'} || ''; ++ my $version = $properties{'PHPVersion'} || '74'; + $OUT .=<<"_EOF"; + + SetHandler "proxy:unix:/var/run/php-fpm/php$version-$key.sock|fcgi://localhost" 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 --- 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/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 @@ -0,0 +1,72 @@ +{ + @@ -44,7 +56,7 @@ diff -Nur --no-dereference smeserver-sha +my $a = esmith::AccountsDB->open_ro || die "Couldn't open the accounts database"; + +foreach my $share ($a->get_all_by_prop(type => 'share')){ -+ my $version = $share->prop('PHPVersion') || ''; ++ my $version = $share->prop('PHPVersion') || '74'; + my $dynamic = $share->prop('DynamicContent') || 'disabled'; + my $custom = $share->prop('PHPCustomPool') || undef; + next unless ($dynamic eq 'enabled' && $version eq $PHP_VERSION && !$custom);