smeserver-freepbx/contribs10/smeserver-freepbx-14-bz12481-bz12506.patch

diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All smeserver-freepbx-14/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All
--- smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All    2022-03-27 23:45:44.000000000 -0400
+++ smeserver-freepbx-14/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All        2024-04-23 01:17:27.574000000 -0400
@@ -10,6 +10,12 @@
 /var/log/asterisk/cdr-csv/Master.csv
 /var/log/asterisk/warnings 
 /var/log/asterisk/misdn.log 
+/var/log/asterisk/backup.log
+/var/log/asterisk/backup-*.log
+/var/log/asterisk/freepbx_dbug
+/var/log/asterisk/core-fastagi_out.log
+/var/log/asterisk/core-calltransfer-monitor_err.log
+/var/log/asterisk/core-calltransfer-monitor_out.log
 \{
     missingok
     notifempty
diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx smeserver-freepbx-14/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx
--- smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx        2024-04-22 22:38:48.488000000 -0400
+++ smeserver-freepbx-14/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx    2024-04-22 22:50:58.057000000 -0400
@@ -8,7 +8,7 @@
     my $memory_limit = ($freepbx{MemoryLimit} || '512M');
     $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
     my $open_basedir= $freepbx{PHPBaseDir} || '';
-    $open_basedir = "/usr/share/freepbx:/var/lib/freepbx:/var/log/freepbx.log:/var/lib/php/freepbx:/home/e-smith/files/freepbx:/dev/urandom:/proc/meminfo:$open_basedir";
+    $open_basedir = "/usr/share/freepbx:/var/lib/freepbx:/var/log/freepbx/:/var/lib/php/freepbx:/home/e-smith/files/freepbx:/dev/urandom:/proc/meminfo:$open_basedir";
     my $id = 'freepbx';
     my $max_children = $freepbx{'PHPmaxChildren'} || 15;
     my $min_spare_servers = $freepbx{'PHPminServers'} || 3;
@@ -41,7 +41,7 @@
 
 php_flag[display_errors] = off
 php_admin_flag[log_errors] = on
-php_admin_value[error_log] = /var/log/php/$id/error.log
+php_admin_value[error_log] = /var/log/$id/error.log
 php_admin_value[memory_limit] = $memory_limit
 php_admin_value[session.save_path] = /var/lib/php/fpbx-session
 php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp
diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/logrotate.d/freepbx smeserver-freepbx-14/root/etc/logrotate.d/freepbx
--- smeserver-freepbx-14.old/root/etc/logrotate.d/freepbx       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-freepbx-14/root/etc/logrotate.d/freepbx   2024-04-22 22:55:02.323000000 -0400
@@ -0,0 +1,13 @@
+/var/log/freepbx/*.log {
+    missingok
+    notifempty
+    sharedscripts
+    delaycompress
+    su asterisk asterisk
+    create 660 asterisk asterisk
+    postrotate
+      /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 || true
+      /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 || true
+    endscript
+}
+
1	diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All smeserver-freepbx-14/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All
2	--- smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All 2022-03-27 23:45:44.000000000 -0400
3	+++ smeserver-freepbx-14/root/etc/e-smith/templates/etc/logrotate.d/asterisk/All 2024-04-23 01:17:27.574000000 -0400
4	@@ -10,6 +10,12 @@
5	/var/log/asterisk/cdr-csv/Master.csv
6	/var/log/asterisk/warnings
7	/var/log/asterisk/misdn.log
8	+/var/log/asterisk/backup.log
9	+/var/log/asterisk/backup-*.log
10	+/var/log/asterisk/freepbx_dbug
11	+/var/log/asterisk/core-fastagi_out.log
12	+/var/log/asterisk/core-calltransfer-monitor_err.log
13	+/var/log/asterisk/core-calltransfer-monitor_out.log
14	\{
15	missingok
16	notifempty
17	diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx smeserver-freepbx-14/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx
18	--- smeserver-freepbx-14.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx 2024-04-22 22:38:48.488000000 -0400
19	+++ smeserver-freepbx-14/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/16freepbx 2024-04-22 22:50:58.057000000 -0400
20	@@ -8,7 +8,7 @@
21	my $memory_limit = ($freepbx{MemoryLimit} \|\| '512M');
22	$memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/);
23	my $open_basedir= $freepbx{PHPBaseDir} \|\| '';
24	- $open_basedir = "/usr/share/freepbx:/var/lib/freepbx:/var/log/freepbx.log:/var/lib/php/freepbx:/home/e-smith/files/freepbx:/dev/urandom:/proc/meminfo:$open_basedir";
25	+ $open_basedir = "/usr/share/freepbx:/var/lib/freepbx:/var/log/freepbx/:/var/lib/php/freepbx:/home/e-smith/files/freepbx:/dev/urandom:/proc/meminfo:$open_basedir";
26	my $id = 'freepbx';
27	my $max_children = $freepbx{'PHPmaxChildren'} \|\| 15;
28	my $min_spare_servers = $freepbx{'PHPminServers'} \|\| 3;
29	@@ -41,7 +41,7 @@
30
31	php_flag[display_errors] = off
32	php_admin_flag[log_errors] = on
33	-php_admin_value[error_log] = /var/log/php/$id/error.log
34	+php_admin_value[error_log] = /var/log/$id/error.log
35	php_admin_value[memory_limit] = $memory_limit
36	php_admin_value[session.save_path] = /var/lib/php/fpbx-session
37	php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp
38	diff -Nur --no-dereference smeserver-freepbx-14.old/root/etc/logrotate.d/freepbx smeserver-freepbx-14/root/etc/logrotate.d/freepbx
39	--- smeserver-freepbx-14.old/root/etc/logrotate.d/freepbx 1969-12-31 19:00:00.000000000 -0500
40	+++ smeserver-freepbx-14/root/etc/logrotate.d/freepbx 2024-04-22 22:55:02.323000000 -0400
41	@@ -0,0 +1,13 @@
42	+/var/log/freepbx/*.log {
43	+ missingok
44	+ notifempty
45	+ sharedscripts
46	+ delaycompress
47	+ su asterisk asterisk
48	+ create 660 asterisk asterisk
49	+ postrotate
50	+ /sbin/e-smith/service php56-php-fpm reload >/dev/null 2>&1 \|\| true
51	+ /sbin/e-smith/service php74-php-fpm reload >/dev/null 2>&1 \|\| true
52	+ endscript
53	+}
54	+