diff -Nur --no-dereference smeserver-shared-folders-0.3.old/createlinks smeserver-shared-folders-0.3/createlinks --- smeserver-shared-folders-0.3.old/createlinks 2022-07-25 01:14:56.328000000 -0400 +++ smeserver-shared-folders-0.3/createlinks 2022-07-25 01:33:17.069000000 -0400 @@ -84,3 +84,32 @@ templates2events("/etc/rsyncd.conf", "bootstrap-console-save"); templates2events("/etc/rsyncd.conf", "remoteaccess-update"); +# for php-fpm +foreach my $service (qw(php-fpm php55-php-fpm php56-php-fpm php70-php-fpm php71-php-fpm php72-php-fpm php73-php-fpm php74-php-fpm php80-php-fpm php81-php-fpm)){ + foreach my $event qw(share-create share-modify share-modify-server share-delete smeserver-shared-update){ + safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/$service"); + } +} + + + +foreach my $file qw( /etc/php-fpm.d/shares.conf + /opt/remi/php55/root/etc/php-fpm.d/shares.conf + /opt/remi/php56/root/etc/php-fpm.d/shares.conf + /etc/opt/remi/php70/php-fpm.d/shares.conf + /etc/opt/remi/php71/php-fpm.d/shares.conf + /etc/opt/remi/php72/php-fpm.d/shares.conf + /etc/opt/remi/php73/php-fpm.d/shares.conf + /etc/opt/remi/php74/php-fpm.d/shares.conf + /etc/opt/remi/php80/php-fpm.d/shares.conf + /etc/opt/remi/php81/php-fpm.d/shares.conf ){ + templates2events($file, qw(webapps-update bootstrap-console-save share-create share-modify share-modify-server share-delete smeserver-shared-update smeserver-php-update)); + safe_symlink('/etc/e-smith/templates-default/template-begin-ini', "root/etc/e-smith/templates$file/template-begin"); +} + + +event_link("php-pool-dirs", "share-create", "90"); +event_link("php-pool-dirs", "share-modify", "90"); +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/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 @@ -0,0 +1,72 @@ +{ + +use esmith::AccountsDB; +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 $dynamic = $share->prop('DynamicContent') || 'disabled'; + my $custom = $share->prop('PHPCustomPool') || undef; + next unless ($dynamic eq 'enabled' && $version eq $PHP_VERSION && !$custom); + my $key = $share->key; + my $pool_name = 'php' . $version . '-' . $key; + my $memory_limit = $share->prop('PHPMemoryLimit') || '128M'; + my $max_execution_time = $share->prop('PHPMaxExecutionTime') || '30'; + my $max_input_time = $share->prop('PHPMaxInputTime') || '60'; + my $allow_url_fopen = $share->prop('PHPAllowUrlFopen') || 'disabled'; + my $post_max_size = $share->prop('PHPPostMaxSize') || '10M'; + my $upload_max_filesize = $share->prop('PHPUploadMaxFilesize') || '10M'; + my $file_upload = $share->prop('PHPFileUpload') || 'enabled'; + my $open_basedir = $share->prop('PHPBaseDir') || '/home/e-smith/files/shares/' . $key . + ':/var/lib/php/' . $key; + my $disabled_functions = $share->prop('PHPDisabledFunctions') || 'system,show_source,' . + 'symlink,exec,dl,shell_exec,' . + 'passthru,phpinfo,' . + 'escapeshellarg,escapeshellcmd'; + # Format vars + $file_upload = ($file_upload =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; + $allow_url_fopen = ($allow_url_fopen =~ m/^1|yes|on|enabled$/) ? 'on' : 'off'; + $disabled_functions = join(', ', split /[,;:]/, $disabled_functions); + $open_basedir = join(':', split(/[,;:]/, $open_basedir)); + + $OUT .=<<"_EOF" if ($version eq $PHP_VERSION); + +[$pool_name] +user = www +group = www +listen.owner = root +listen.group = www +listen.mode = 0660 +listen = /var/run/php-fpm/$pool_name.sock +pm = dynamic +pm.max_children = 15 +pm.start_servers = 3 +pm.min_spare_servers = 3 +pm.max_spare_servers = 4 +pm.max_requests = 1000 +slowlog = /var/log/php/$key/slow.log +php_admin_value[session.save_path] = /var/lib/php/$key/session +php_admin_value[opcache.file_cache] = /var/lib/php/$key/opcache +php_admin_value[upload_tmp_dir] = /var/lib/php/$key/tmp +php_admin_value[error_log] = /var/log/php/$key/error.log +php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName } +php_admin_flag[display_errors] = off +php_admin_flag[log_errors] = on +php_admin_value[error_log] = syslog +php_admin_value[memory_limit] = $memory_limit +php_admin_value[max_execution_time] = $max_execution_time +php_admin_value[post_max_size] = $post_max_size +php_admin_value[upload_max_filesize] = $upload_max_filesize +php_admin_value[max_input_time] = $max_input_time +php_admin_value[disable_functions] = $disabled_functions +php_admin_flag[allow_url_fopen] = $allow_url_fopen +php_admin_flag[file_upload] = $file_upload +php_admin_flag[session.cookie_httponly] = on +php_admin_flag[allow_url_include] = off +php_admin_value[session.save_handler] = files +php_admin_value[open_basedir] = $open_basedir + +_EOF +} + +} diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php70/php-fpm.d/shares.conf 2017-07-27 12:05:00.000000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 70 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php71/php-fpm.d/shares.conf 2017-07-27 12:05:00.000000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 71 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php72/php-fpm.d/shares.conf 2020-01-27 13:27:12.000000000 -0500 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 72 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php73/php-fpm.d/shares.conf 2020-01-27 13:27:12.000000000 -0500 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 73 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php74/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php74/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php74/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php74/php-fpm.d/shares.conf 2022-07-25 01:20:02.519000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 74 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php80/php-fpm.d/shares.conf 2022-07-25 01:20:16.726000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 80 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/opt/remi/php81/php-fpm.d/shares.conf 2022-07-25 01:20:29.574000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 80 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/etc/php-fpm.d/shares.conf 2017-07-27 12:05:00.000000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => '' } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/opt/remi/php55/root/etc/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/opt/remi/php55/root/etc/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/opt/remi/php55/root/etc/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/opt/remi/php55/root/etc/php-fpm.d/shares.conf 2022-07-25 01:22:17.066000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 55 } diff -Nur --no-dereference smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf --- smeserver-shared-folders-0.3.old/root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-shared-folders-0.3/root/etc/e-smith/templates.metadata/opt/remi/php56/root/etc/php-fpm.d/shares.conf 2017-07-27 12:05:00.000000000 -0400 @@ -0,0 +1,2 @@ +TEMPLATE_PATH="/etc/php-fpm.d/shares.conf" +MORE_DATA={ PHP_VERSION => 56 }