diff -Nur smeserver-php-3.0.0.old/createlinks smeserver-php-3.0.0/createlinks --- smeserver-php-3.0.0.old/createlinks 2020-11-18 21:37:29.437000000 -0500 +++ smeserver-php-3.0.0/createlinks 2020-11-18 21:50:34.695000000 -0500 @@ -20,6 +20,9 @@ )); } +templates2events("/etc/rsyslog.conf","smeserver-php-update"); +safe_symlink("restart", "root/etc/e-smith/events/smeserver-php-update/services2adjust/rsyslog"); + #new php-fpm foreach $service (qw(php-fpm)){ foreach $event (qw(webapps-update ibay-create ibay-delete ibay-modify ibay-modify-files ibay-modify-servers )){ @@ -58,8 +61,17 @@ safe_symlink('/etc/e-smith/templates-default/template-begin-ini', "root/etc/e-smith/templates/etc/php.ini/template-begin"); foreach $file (qw( /etc/sysconfig/php-fpm - /etc/logrotate.d/php-fpm )){ - templates2events($file, qw(webapps-update bootstrap-console-save)); + /etc/logrotate.d/php-fpm + /etc/logrotate.d/php55-php-fpm + /etc/logrotate.d/php56-php-fpm + /etc/logrotate.d/php70-php-fpm + /etc/logrotate.d/php70-php-fpm + /etc/logrotate.d/php71-php-fpm + /etc/logrotate.d/php72-php-fpm + /etc/logrotate.d/php73-php-fpm + /etc/logrotate.d/php74-php-fpm + )){ + templates2events($file, qw(webapps-update bootstrap-console-save smeserver-php-update)); } #php5* diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/02php smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/02php --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/02php 2020-11-18 21:37:29.333000000 -0500 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/02php 1969-12-31 19:00:00.000000000 -0500 @@ -1,19 +0,0 @@ -#php logging - -:programname, isequal, "php" /var/log/php/php/error.log -:programname, isequal, "php" ~ -:programname, startswith, "php-fpm" /var/log/php/php/php-fpm.log -:programname, startswith, "php-fpm" ~ -:programname, startswith, "php56-fpm" /var/log/php/php56/php56-fpm.log -:programname, startswith, "php56-fpm" ~ -:programname, startswith, "php70-fpm" /var/log/php/php70/php70-fpm.log -:programname, startswith, "php70-fpm" ~ -:programname, startswith, "php71-fpm" /var/log/php/php71/php71-fpm.log -:programname, startswith, "php71-fpm" ~ -:programname, startswith, "php72-fpm" /var/log/php/php72/php72-fpm.log -:programname, startswith, "php72-fpm" ~ -:programname, startswith, "php73-fpm" /var/log/php/php73/php73-fpm.log -:programname, startswith, "php73-fpm" ~ -:programname, startswith, "php74-fpm" /var/log/php/php74/php74-fpm.log -:programname, startswith, "php74-fpm" ~ - diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32php smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/rsyslog.conf/32php 1969-12-31 19:00:00.000000000 -0500 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/rsyslog.conf/32php 2020-11-18 21:45:34.169000000 -0500 @@ -0,0 +1,19 @@ +#php logging + +:programname, isequal, "php" /var/log/php/php/error.log +:programname, isequal, "php" stop +:programname, startswith, "php-fpm" /var/log/php/php/php-fpm.log +:programname, startswith, "php-fpm" stop +:programname, startswith, "php56-fpm" /var/log/php/php56/php56-fpm.log +:programname, startswith, "php56-fpm" stop +:programname, startswith, "php70-fpm" /var/log/php/php70/php70-fpm.log +:programname, startswith, "php70-fpm" stop +:programname, startswith, "php71-fpm" /var/log/php/php71/php71-fpm.log +:programname, startswith, "php71-fpm" stop +:programname, startswith, "php72-fpm" /var/log/php/php72/php72-fpm.log +:programname, startswith, "php72-fpm" stop +:programname, startswith, "php73-fpm" /var/log/php/php73/php73-fpm.log +:programname, startswith, "php73-fpm" stop +:programname, startswith, "php74-fpm" /var/log/php/php74/php74-fpm.log +:programname, startswith, "php74-fpm" stop + diff -Nur smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm --- smeserver-php-3.0.0.old/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2019-12-09 23:00:07.000000000 -0500 +++ smeserver-php-3.0.0/root/etc/e-smith/templates/etc/logrotate.d/php-fpm/php-fpm 2020-12-07 00:00:29.405000000 -0500 @@ -1,8 +1,14 @@ -/var/log/php/*/*.log \{ +{ + +return "# all versions in php-fpm file" unless $PHP_VERSION eq ""; + +$OUT = "/var/log/php/*/php*fpm.log { missingok notifempty sharedscripts delaycompress + su root root + create 600 root root postrotate /sbin/e-smith/service php-fpm reload >/dev/null 2>&1 || true /sbin/e-smith/service php55-php-fpm reload >/dev/null 2>&1 || true @@ -13,4 +19,26 @@ /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true endscript -\} +} + +/var/log/php/*/[!php]*.log { + missingok + notifempty + sharedscripts + delaycompress + su www www + create 600 www www + postrotate + /sbin/e-smith/service php-fpm reload >/dev/null 2>&1 || true + /sbin/e-smith/service php55-php-fpm reload >/dev/null 2>&1 || true + /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true + /sbin/e-smith/service php70-php-fpm reload >/dev/null 2>&1 || true + /sbin/e-smith/service php71-php-fpm reload >/dev/null 2>&1 || true + /sbin/e-smith/service php72-php-fpm reload >/dev/null 2>&1 || true + /sbin/e-smith/service php73-php-fpm reload >/dev/null 2>&1 || true + /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true + endscript +} +"; + +}