/[smecontribs]/rpms/smeserver-onlyoffice/contribs10/smeserver-onlyoffice-0.0.5-bz12316-73update.patch
ViewVC logotype

Contents of /rpms/smeserver-onlyoffice/contribs10/smeserver-onlyoffice-0.0.5-bz12316-73update.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Thu Feb 9 04:40:25 2023 UTC (21 months, 1 week ago) by jpp
Branch: MAIN
CVS Tags: smeserver-onlyoffice-0_0_5-8_el7_sme, HEAD
Changes since 1.1: +23 -0 lines 
* Wed Feb 08 2023 Jean-Philippe Pialasse <tests@pialasse.com> 0.0.5-8.sme
- adapt for  onlyoffice 7.3 with systemd services [SME: 12177]
1 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/createlinks smeserver-onlyoffice-0.0.5/createlinks
2 --- smeserver-onlyoffice-0.0.5.old/createlinks 2023-02-07 23:56:37.607000000 -0500
3 +++ smeserver-onlyoffice-0.0.5/createlinks 2023-02-08 00:06:55.546000000 -0500
4 @@ -28,6 +28,9 @@
5 supervisord restart
6 rabbitmq-server restart
7 masq restart
8 + ds-docservice restart
9 + ds-metrics restart
10 + ds-converter restart
11 ));
12
13 #use esmith::Build::Backup qw(:all);
14 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-converter/status smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-converter/status
15 --- smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-converter/status 1969-12-31 19:00:00.000000000 -0500
16 +++ smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-converter/status 2023-02-08 00:00:21.887000000 -0500
17 @@ -0,0 +1 @@
18 +enabled
19 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-converter/type smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-converter/type
20 --- smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-converter/type 1969-12-31 19:00:00.000000000 -0500
21 +++ smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-converter/type 2023-02-07 23:59:40.148000000 -0500
22 @@ -0,0 +1 @@
23 +service
24 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-docservice/status smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-docservice/status
25 --- smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-docservice/status 1969-12-31 19:00:00.000000000 -0500
26 +++ smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-docservice/status 2023-02-08 00:00:01.569000000 -0500
27 @@ -0,0 +1 @@
28 +enabled
29 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-docservice/type smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-docservice/type
30 --- smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-docservice/type 1969-12-31 19:00:00.000000000 -0500
31 +++ smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-docservice/type 2023-02-07 23:59:46.507000000 -0500
32 @@ -0,0 +1 @@
33 +service
34 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-metrics/status smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-metrics/status
35 --- smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-metrics/status 1969-12-31 19:00:00.000000000 -0500
36 +++ smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-metrics/status 2023-02-08 00:00:10.361000000 -0500
37 @@ -0,0 +1 @@
38 +enabled
39 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-metrics/type smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-metrics/type
40 --- smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/db/configuration/defaults/ds-metrics/type 1969-12-31 19:00:00.000000000 -0500
41 +++ smeserver-onlyoffice-0.0.5/root/etc/e-smith/db/configuration/defaults/ds-metrics/type 2023-02-07 23:59:33.669000000 -0500
42 @@ -0,0 +1 @@
43 +service
44 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Onlyoffice/80VirtualHostOnlyoffice smeserver-onlyoffice-0.0.5/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Onlyoffice/80VirtualHostOnlyoffice
45 --- smeserver-onlyoffice-0.0.5.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Onlyoffice/80VirtualHostOnlyoffice 2023-02-07 23:56:37.612000000 -0500
46 +++ smeserver-onlyoffice-0.0.5/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Onlyoffice/80VirtualHostOnlyoffice 2023-02-08 23:38:26.934000000 -0500
47 @@ -29,6 +29,7 @@
48 $OUT = <<"_EOL";
49 ServerName $onlyoffice{'VirtualHost'}
50 SSLEngine On
51 + SSLCompression off
52 _EOL
53
54 $OUT .= " SSLCertificateFile $ssl_file_crt\n" unless $ssl_file_crt eq 'disabled';
55 @@ -52,7 +53,10 @@
56
57 my $OOport = 48000;
58 $OUT .= <<"_EOL";
59 - ProxyPassMatch (.*)(\/websocket)\$ "ws://localhost:$OOport/\$1\$2"
60 + #ProxyPassMatch (.*)(\/websocket)\$ "ws://localhost:$OOport/\$1\$2"
61 + RewriteCond %\{HTTP:Upgrade\} websocket [NC]
62 + RewriteCond %\{HTTP:Connection\} upgrade [NC]
63 + RewriteRule ^/?(.*) "ws://localhost:$OOport/\$1" [P,L]
64 ProxyPass / "http://localhost:$OOport/"
65 ProxyPassReverse / "http://localhost:$OOport/"
66 _EOL
67 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/usr/lib/systemd/system/ds-converter.service.d/51koozali.conf smeserver-onlyoffice-0.0.5/root/usr/lib/systemd/system/ds-converter.service.d/51koozali.conf
68 --- smeserver-onlyoffice-0.0.5.old/root/usr/lib/systemd/system/ds-converter.service.d/51koozali.conf 1969-12-31 19:00:00.000000000 -0500
69 +++ smeserver-onlyoffice-0.0.5/root/usr/lib/systemd/system/ds-converter.service.d/51koozali.conf 2023-02-08 00:04:32.816000000 -0500
70 @@ -0,0 +1,6 @@
71 +[Unit]
72 +After=network-online.target
73 +
74 +[Install]
75 +WantedBy=sme-server.target
76 +
77 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/usr/lib/systemd/system/ds-docservice.service.d/51koozali.conf smeserver-onlyoffice-0.0.5/root/usr/lib/systemd/system/ds-docservice.service.d/51koozali.conf
78 --- smeserver-onlyoffice-0.0.5.old/root/usr/lib/systemd/system/ds-docservice.service.d/51koozali.conf 1969-12-31 19:00:00.000000000 -0500
79 +++ smeserver-onlyoffice-0.0.5/root/usr/lib/systemd/system/ds-docservice.service.d/51koozali.conf 2023-02-08 00:04:25.625000000 -0500
80 @@ -0,0 +1,6 @@
81 +[Unit]
82 +After=network-online.target
83 +
84 +[Install]
85 +WantedBy=sme-server.target
86 +
87 diff -Nur --no-dereference smeserver-onlyoffice-0.0.5.old/root/usr/lib/systemd/system/ds-metrics.service.d/51koozali.conf smeserver-onlyoffice-0.0.5/root/usr/lib/systemd/system/ds-metrics.service.d/51koozali.conf
88 --- smeserver-onlyoffice-0.0.5.old/root/usr/lib/systemd/system/ds-metrics.service.d/51koozali.conf 1969-12-31 19:00:00.000000000 -0500
89 +++ smeserver-onlyoffice-0.0.5/root/usr/lib/systemd/system/ds-metrics.service.d/51koozali.conf 2023-02-08 00:03:28.948000000 -0500
90 @@ -0,0 +1,6 @@
91 +[Unit]
92 +After=network-online.target
93 +
94 +[Install]
95 +WantedBy=sme-server.target
96 +
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed