/[smecontribs]/rpms/smeserver-collabora/contribs10/smeserver-collabora-0.1.6-bz11895-httpd-template.patch
ViewVC logotype

Contents of /rpms/smeserver-collabora/contribs10/smeserver-collabora-0.1.6-bz11895-httpd-template.patch

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

Revision 1.1 - (show annotations) (download)
Fri Mar 11 06:11:29 2022 UTC (2 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-collabora-0_1_6-7_el7_sme, smeserver-collabora-0_1_6-4_el7_sme, smeserver-collabora-0_1_6-5_el7_sme, smeserver-collabora-0_1_6-3_el7_sme, smeserver-collabora-0_1_6-6_el7_sme, HEAD 
* Fri Mar 11 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.6-3.sme
- fix httpd template path [SME: 11895]
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 2022-03-11 01:05:35.434000000 -0500
3 +++ smeserver-collabora-0.1.6/createlinks 2022-03-11 01:08:25.349000000 -0500
4 @@ -12,7 +12,7 @@
5 ));
6
7 event_templates($event, qw(
8 - /etc/httpd/conf.d/zz_collabora.conf
9 + /etc/httpd/conf/httpd.conf
10 ));
11
12 event_services($event, qw(
13 diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80VirtualHostsCollabora smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80VirtualHostsCollabora
14 --- smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80VirtualHostsCollabora 1969-12-31 19:00:00.000000000 -0500
15 +++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80VirtualHostsCollabora 2022-03-09 21:33:15.000000000 -0500
16 @@ -0,0 +1,47 @@
17 +{
18 + my $domain = $coolwsd{'VirtualHost'} || '';
19 +
20 + if ($domain ne '') {
21 + $OUT .= "<VirtualHost *:443>\n";
22 +
23 + $OUT .= " Options -Indexes\n";
24 +
25 + $OUT .= " ServerName $domain\n";
26 +
27 + $OUT .= " SSLEngine on\n";
28 +
29 + $OUT .= " # Encoded slashes need to be allowed\n";
30 + $OUT .= " AllowEncodedSlashes NoDecode\n";
31 +
32 + $OUT .= " # keep the host\n";
33 + $OUT .= " ProxyPreserveHost On\n";
34 +
35 + $OUT .= " # static html, js, images, etc. served from coolwsd\n";
36 + $OUT .= " # browser is the client part of LibreOffice Online\n";
37 + $OUT .= " ProxyPass /browser http://127.0.0.1:9980/browser retry=0\n";
38 + $OUT .= " ProxyPassReverse /browser http://127.0.0.1:9980/browser\n";
39 +
40 + $OUT .= " # WOPI discovery URL\n";
41 + $OUT .= " ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0\n";
42 + $OUT .= " ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery\n";
43 +
44 + $OUT .= " # Main websocket\n";
45 + $OUT .= " ProxyPassMatch \"/cool/(.*)/ws\$\" ws://127.0.0.1:9980/cool/\$1/ws nocanon\n";
46 +
47 + $OUT .= " # Admin Console websocket\n";
48 + $OUT .= " ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws\n";
49 +
50 + $OUT .= " # Download as, Fullscreen presentation and Image upload operations\n";
51 + $OUT .= " ProxyPass /cool http://127.0.0.1:9980/cool\n";
52 + $OUT .= " ProxyPassReverse /cool http://127.0.0.1:9980/cool\n";
53 +
54 + $OUT .= " # Compatibility with integrations that use the /lool/convert-to endpoint\n";
55 + $OUT .= " ProxyPass /lool http://127.0.0.1:9980/cool\n";
56 + $OUT .= " ProxyPassReverse /lool http://127.0.0.1:9980/cool\n";
57 +
58 + $OUT .= " # Endpoint with information about availability of various features\n";
59 + $OUT .= " ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0\n";
60 + $OUT .= " ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities\n";
61 + $OUT .= "</VirtualHost>\n";
62 + }
63 +}
64 diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf.d/zz_collabora.conf/10base smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf.d/zz_collabora.conf/10base
65 --- smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf.d/zz_collabora.conf/10base 2022-03-09 21:33:15.000000000 -0500
66 +++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf.d/zz_collabora.conf/10base 1969-12-31 19:00:00.000000000 -0500
67 @@ -1,47 +0,0 @@
68 -{
69 - my $domain = $coolwsd{'VirtualHost'} || '';
70 -
71 - if ($domain ne '') {
72 - $OUT .= "<VirtualHost *:443>\n";
73 -
74 - $OUT .= " Options -Indexes\n";
75 -
76 - $OUT .= " ServerName $domain\n";
77 -
78 - $OUT .= " SSLEngine on\n";
79 -
80 - $OUT .= " # Encoded slashes need to be allowed\n";
81 - $OUT .= " AllowEncodedSlashes NoDecode\n";
82 -
83 - $OUT .= " # keep the host\n";
84 - $OUT .= " ProxyPreserveHost On\n";
85 -
86 - $OUT .= " # static html, js, images, etc. served from coolwsd\n";
87 - $OUT .= " # browser is the client part of LibreOffice Online\n";
88 - $OUT .= " ProxyPass /browser http://127.0.0.1:9980/browser retry=0\n";
89 - $OUT .= " ProxyPassReverse /browser http://127.0.0.1:9980/browser\n";
90 -
91 - $OUT .= " # WOPI discovery URL\n";
92 - $OUT .= " ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0\n";
93 - $OUT .= " ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery\n";
94 -
95 - $OUT .= " # Main websocket\n";
96 - $OUT .= " ProxyPassMatch \"/cool/(.*)/ws\$\" ws://127.0.0.1:9980/cool/\$1/ws nocanon\n";
97 -
98 - $OUT .= " # Admin Console websocket\n";
99 - $OUT .= " ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws\n";
100 -
101 - $OUT .= " # Download as, Fullscreen presentation and Image upload operations\n";
102 - $OUT .= " ProxyPass /cool http://127.0.0.1:9980/cool\n";
103 - $OUT .= " ProxyPassReverse /cool http://127.0.0.1:9980/cool\n";
104 -
105 - $OUT .= " # Compatibility with integrations that use the /lool/convert-to endpoint\n";
106 - $OUT .= " ProxyPass /lool http://127.0.0.1:9980/cool\n";
107 - $OUT .= " ProxyPassReverse /lool http://127.0.0.1:9980/cool\n";
108 -
109 - $OUT .= " # Endpoint with information about availability of various features\n";
110 - $OUT .= " ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0\n";
111 - $OUT .= " ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities\n";
112 - $OUT .= "</VirtualHost>\n";
113 - }
114 -}
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed