diff -Nur --no-dereference smeserver-collabora-0.1.6.old/createlinks smeserver-collabora-0.1.6/createlinks
--- smeserver-collabora-0.1.6.old/createlinks 2022-03-11 01:05:35.434000000 -0500
+++ smeserver-collabora-0.1.6/createlinks 2022-03-11 01:08:25.349000000 -0500
@@ -12,7 +12,7 @@
));
event_templates($event, qw(
- /etc/httpd/conf.d/zz_collabora.conf
+ /etc/httpd/conf/httpd.conf
));
event_services($event, qw(
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
--- 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
+++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80VirtualHostsCollabora 2022-03-09 21:33:15.000000000 -0500
@@ -0,0 +1,47 @@
+{
+ my $domain = $coolwsd{'VirtualHost'} || '';
+
+ if ($domain ne '') {
+ $OUT .= "\n";
+
+ $OUT .= " Options -Indexes\n";
+
+ $OUT .= " ServerName $domain\n";
+
+ $OUT .= " SSLEngine on\n";
+
+ $OUT .= " # Encoded slashes need to be allowed\n";
+ $OUT .= " AllowEncodedSlashes NoDecode\n";
+
+ $OUT .= " # keep the host\n";
+ $OUT .= " ProxyPreserveHost On\n";
+
+ $OUT .= " # static html, js, images, etc. served from coolwsd\n";
+ $OUT .= " # browser is the client part of LibreOffice Online\n";
+ $OUT .= " ProxyPass /browser http://127.0.0.1:9980/browser retry=0\n";
+ $OUT .= " ProxyPassReverse /browser http://127.0.0.1:9980/browser\n";
+
+ $OUT .= " # WOPI discovery URL\n";
+ $OUT .= " ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0\n";
+ $OUT .= " ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery\n";
+
+ $OUT .= " # Main websocket\n";
+ $OUT .= " ProxyPassMatch \"/cool/(.*)/ws\$\" ws://127.0.0.1:9980/cool/\$1/ws nocanon\n";
+
+ $OUT .= " # Admin Console websocket\n";
+ $OUT .= " ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws\n";
+
+ $OUT .= " # Download as, Fullscreen presentation and Image upload operations\n";
+ $OUT .= " ProxyPass /cool http://127.0.0.1:9980/cool\n";
+ $OUT .= " ProxyPassReverse /cool http://127.0.0.1:9980/cool\n";
+
+ $OUT .= " # Compatibility with integrations that use the /lool/convert-to endpoint\n";
+ $OUT .= " ProxyPass /lool http://127.0.0.1:9980/cool\n";
+ $OUT .= " ProxyPassReverse /lool http://127.0.0.1:9980/cool\n";
+
+ $OUT .= " # Endpoint with information about availability of various features\n";
+ $OUT .= " ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0\n";
+ $OUT .= " ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities\n";
+ $OUT .= "\n";
+ }
+}
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
--- 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
+++ 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
@@ -1,47 +0,0 @@
-{
- my $domain = $coolwsd{'VirtualHost'} || '';
-
- if ($domain ne '') {
- $OUT .= "\n";
-
- $OUT .= " Options -Indexes\n";
-
- $OUT .= " ServerName $domain\n";
-
- $OUT .= " SSLEngine on\n";
-
- $OUT .= " # Encoded slashes need to be allowed\n";
- $OUT .= " AllowEncodedSlashes NoDecode\n";
-
- $OUT .= " # keep the host\n";
- $OUT .= " ProxyPreserveHost On\n";
-
- $OUT .= " # static html, js, images, etc. served from coolwsd\n";
- $OUT .= " # browser is the client part of LibreOffice Online\n";
- $OUT .= " ProxyPass /browser http://127.0.0.1:9980/browser retry=0\n";
- $OUT .= " ProxyPassReverse /browser http://127.0.0.1:9980/browser\n";
-
- $OUT .= " # WOPI discovery URL\n";
- $OUT .= " ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0\n";
- $OUT .= " ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery\n";
-
- $OUT .= " # Main websocket\n";
- $OUT .= " ProxyPassMatch \"/cool/(.*)/ws\$\" ws://127.0.0.1:9980/cool/\$1/ws nocanon\n";
-
- $OUT .= " # Admin Console websocket\n";
- $OUT .= " ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws\n";
-
- $OUT .= " # Download as, Fullscreen presentation and Image upload operations\n";
- $OUT .= " ProxyPass /cool http://127.0.0.1:9980/cool\n";
- $OUT .= " ProxyPassReverse /cool http://127.0.0.1:9980/cool\n";
-
- $OUT .= " # Compatibility with integrations that use the /lool/convert-to endpoint\n";
- $OUT .= " ProxyPass /lool http://127.0.0.1:9980/cool\n";
- $OUT .= " ProxyPassReverse /lool http://127.0.0.1:9980/cool\n";
-
- $OUT .= " # Endpoint with information about availability of various features\n";
- $OUT .= " ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0\n";
- $OUT .= " ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities\n";
- $OUT .= "\n";
- }
-}