diff -Nur --no-dereference smeserver-zoneminder-1.0.old/createlinks smeserver-zoneminder-1.0/createlinks --- smeserver-zoneminder-1.0.old/createlinks 2023-03-24 23:29:05.691000000 -0400 +++ smeserver-zoneminder-1.0/createlinks 2023-03-24 23:49:37.864000000 -0400 @@ -13,8 +13,10 @@ templates2events("/etc/e-smith/sql/init/30zoneminder", $event); templates2events("/etc/httpd/conf/httpd.conf", $event); templates2events("/etc/zm/zm.conf", $event); +templates2events("/etc/opt/remi/php74/php-fpm.d/www.conf", $event); event_link("zoneminder", $event, "10"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/php74-php-fpm"); # add expand zm.conf foreach my $event (qw(post-upgrade bootstrap-console-save console-save remoteaccess-update php-update webapps-update)){ @@ -32,6 +34,7 @@ /etc/zm/zm.conf /etc/httpd/conf/httpd.conf /etc/e-smith/sql/init/30zoneminder + /etc/opt/remi/php74/php-fpm.d/www.conf )) { templates2events( $file, $event ); @@ -46,8 +49,9 @@ #services we need to restart safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zoneminder") -; +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zoneminder"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/php74-php-fpm"); + use esmith::Build::Backup qw(:all); backup_includes("smeserver-zoneminder", qw( /var/lib/zoneminder diff -Nur --no-dereference smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2023-03-24 23:29:05.685000000 -0400 +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2023-03-24 23:41:40.633000000 -0400 @@ -20,7 +20,7 @@ Options -Indexes +MultiViews +FollowSymLinks #AddType application/x-httpd-php .php - SetHandler "proxy:unix:/var/run/php-fpm/php74.sock|fcgi://localhost" + SetHandler "proxy:unix:/var/run/php-fpm/php74-zoneminder.sock|fcgi://localhost" AllowOverride All AuthName "Zoneminder" diff -Nur --no-dereference smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15zm smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15zm --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15zm 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15zm 2023-03-24 23:44:04.640000000 -0400 @@ -0,0 +1,65 @@ +{ + +if ($PHP_VERSION eq '74'){ + if (($zoneminder{'status'} || 'disabled') eq 'enabled'){ + my $max_upload_size = ($zoneminder{MaxUploadSize} || '4096'); + $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/); + my $memory_limit = ($zoneminder{MemoryLimit} || '500M'); + $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/); + my $open_basedir= $zoneminder{PHPBaseDir} || ''; + $open_basedir = "/usr/share/zoneminder:/var/cache/zoneminder:/usr/libexec/zoneminder:/var/log/zoneminder/:/var/lib/php/zoneminder:$open_basedir"; + my $id = 'zoneminder'; + my $max_children = $zoneminder{'PHPmaxChildren'} || 20; + my $min_spare_servers = $zoneminder{'PHPminServers'} || 4; + my $start_servers = $zoneminder{'PHPstartServers'} || 6; + my $max_spare_servers = $zoneminder{'PHPmaxServers'} || 8; + my $max_requests = $zoneminder{'PHPmaxRequests'} || 1000; + $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers; + $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 + $min_spare_servers/2 ) : $start_servers; + + $OUT .=<<_EOF; + +[php$PHP_VERSION-$id] +user = www +group = www +listen.owner = root +listen.group = www +listen.mode = 0660 +listen = /var/run/php-fpm/php$PHP_VERSION-$id.sock +pm = dynamic +pm.max_children = $max_children +pm.start_servers = $start_servers +pm.min_spare_servers = $min_spare_servers +pm.max_spare_servers = $max_spare_servers +pm.max_requests = $max_requests +php_admin_value[session.save_path] = /var/lib/php/$id/session +php_admin_value[session.gc_maxlifetime] = 86400 +php_admin_value[opcache.file_cache] = /var/lib/php/$id/opcache +php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp +php_admin_value[error_log] = /var/log/php/$id/error.log +slowlog = /var/log/php/zoneminder/slow.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] = 3600 +php_admin_value[post_max_size] = $max_upload_size +php_admin_value[upload_max_filesize] = $max_upload_size +php_admin_value[disable_functions] = system, show_source, dl, passthru, phpinfo +php_admin_value[open_basedir] = $open_basedir +php_admin_flag[allow_url_fopen] = on +php_admin_flag[file_uploads] = on +php_admin_flag[session.cookie_httponly] = on +php_admin_flag[allow_url_include] = off +php_admin_value[session.save_handler] = files +php_admin_flag[output_buffering] = off + +_EOF + + } + else{ + $OUT .= '; zoneminder is disabled'; + } +} +}