diff --git a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20tt-rss b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20tt-rss index 16b0cf0..127d6b4 100644 --- a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20tt-rss +++ b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/20tt-rss @@ -1,15 +1,16 @@ { if ($PHP_VERSION eq '71'){ if ((${'tt-rss'}{status} || 'disabled') eq 'enabled'){ + my $id = 'tt-rss; $OUT .=<<_EOF; -[php71-tt-rss] +[php$PHP_VERSION-$id] user = www group = www listen.owner = root listen.group = www listen.mode = 0660 -listen = /var/run/php-fpm/php71-tt-rss.sock +listen = /var/run/php-fpm/php$PHP_VERSION-$id.sock pm = dynamic pm.max_children = 15 pm.start_servers = 3 @@ -17,12 +18,11 @@ pm.min_spare_servers = 3 pm.max_spare_servers = 4 pm.max_requests = 5000 request_terminate_timeout = 30 -php_admin_value[session.save_path] = /var/lib/php/tt-rss/session -php_admin_value[soap.wsdl_cache_dir] = /var/lib/php/tt-rss/wsdlcache -php_admin_value[opcache.file_cache] = /var/lib/php/tt-rss/opcache -php_admin_value[upload_tmp_dir] = /var/lib/php/tt-rss/tmp -php_admin_value[error_log] = /var/log/php/tt-rss/error.log -slowlog = /var/log/php/tt-rss/slow.log +php_admin_value[session.save_path] = /var/lib/php/$id/session +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/$id/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