smeserver-collabora/contribs10/smeserver-collabora-0.1.6-bz12248.patch

diff -Nur --no-dereference smeserver-collabora-0.1.6.old/createlinks smeserver-collabora-0.1.6/createlinks
--- smeserver-collabora-0.1.6.old/createlinks   2023-02-06 22:46:15.128000000 -0500
+++ smeserver-collabora-0.1.6/createlinks       2023-02-06 22:56:21.372000000 -0500
@@ -13,12 +13,14 @@
 
 event_templates($event, qw(
   /etc/httpd/conf/httpd.conf
+  /etc/rsyslog.conf
 ));
 
 event_services($event, qw(
                httpd reload
                coolwsd restart
               php73-php-fpm reload-or-restart
+               rsyslog restart
 ));
 
 $event = 'smeserver-nextcloud-update';
diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora
--- smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora       1969-12-31 19:00:00.000000000 -0500
+++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora   2023-02-06 23:04:01.066000000 -0500
@@ -0,0 +1,6 @@
+# collabora
+#first remove log noise
+if $programname == "coolwsd" and  $msg contains 'WRN  Util::stringVectorToMap => record is misformed: #' then stop
+:programname, isequal, "coolwsd"            /var/log/coolwsd.log
+& stop
+
diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/logrotate.d/collabora smeserver-collabora-0.1.6/root/etc/logrotate.d/collabora
--- smeserver-collabora-0.1.6.old/root/etc/logrotate.d/collabora        1969-12-31 19:00:00.000000000 -0500
+++ smeserver-collabora-0.1.6/root/etc/logrotate.d/collabora    2023-02-06 22:55:26.357000000 -0500
@@ -0,0 +1,9 @@
+/var/log/coolwsd.log
+{
+    missingok
+    sharedscripts
+    postrotate
+        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+    endscript
+}
+
1	diff -Nur --no-dereference smeserver-collabora-0.1.6.old/createlinks smeserver-collabora-0.1.6/createlinks
2	--- smeserver-collabora-0.1.6.old/createlinks 2023-02-06 22:46:15.128000000 -0500
3	+++ smeserver-collabora-0.1.6/createlinks 2023-02-06 22:56:21.372000000 -0500
4	@@ -13,12 +13,14 @@
5
6	event_templates($event, qw(
7	/etc/httpd/conf/httpd.conf
8	+ /etc/rsyslog.conf
9	));
10
11	event_services($event, qw(
12	httpd reload
13	coolwsd restart
14	php73-php-fpm reload-or-restart
15	+ rsyslog restart
16	));
17
18	$event = 'smeserver-nextcloud-update';
19	diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora
20	--- smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora 1969-12-31 19:00:00.000000000 -0500
21	+++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora 2023-02-06 23:04:01.066000000 -0500
22	@@ -0,0 +1,6 @@
23	+# collabora
24	+#first remove log noise
25	+if $programname == "coolwsd" and $msg contains 'WRN Util::stringVectorToMap => record is misformed: #' then stop
26	+:programname, isequal, "coolwsd" /var/log/coolwsd.log
27	+& stop
28	+
29	diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/logrotate.d/collabora smeserver-collabora-0.1.6/root/etc/logrotate.d/collabora
30	--- smeserver-collabora-0.1.6.old/root/etc/logrotate.d/collabora 1969-12-31 19:00:00.000000000 -0500
31	+++ smeserver-collabora-0.1.6/root/etc/logrotate.d/collabora 2023-02-06 22:55:26.357000000 -0500
32	@@ -0,0 +1,9 @@
33	+/var/log/coolwsd.log
34	+{
35	+ missingok
36	+ sharedscripts
37	+ postrotate
38	+ /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null \|\| true
39	+ endscript
40	+}
41	+