--- rpms/smeserver-collabora/contribs10/smeserver-collabora-0.1.6-bz11895-Virtualhost.patch 2022/03/23 03:19:55 1.2 +++ rpms/smeserver-collabora/contribs10/smeserver-collabora-0.1.6-bz11895-Virtualhost.patch 2022/03/23 03:36:26 1.3 @@ -89,23 +89,20 @@ diff -Nur --no-dereference smeserver-col +} diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora --- smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora 1969-12-31 19:00:00.000000000 -0500 -+++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora 2022-03-22 23:19:21.261000000 -0400 -@@ -0,0 +1,64 @@ ++++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora 2022-03-22 23:35:16.351000000 -0400 +@@ -0,0 +1,59 @@ +{ -+ my $domain = $coolwsd{'VirtualHost'} || ''; -+ -+ if ($domain ne '') { + if (($port eq "80") ){ + -+ $OUT .= " ServerName $domain\n"; -+ $OUT .= " Redirect permanent / https://$domain/ \n"; ++ $OUT .= " ServerName $virtualHost\n"; ++ $OUT .= " Redirect permanent / https://$virtualHost/ \n"; + $OUT .= "\n"; + } + else { + + $OUT .= " Options -Indexes\n"; + -+ $OUT .= " ServerName $domain\n"; ++ $OUT .= " ServerName $virtualHost\n"; + + $OUT .= " SSLEngine on\n"; + @@ -151,9 +148,7 @@ diff -Nur --no-dereference smeserver-col + $OUT .= " # base\n"; + $OUT .= " ProxyPass / http://127.0.0.1:9980/ retry=0\n"; + $OUT .= " ProxyPassReverse / http://127.0.0.1:9980/\n"; -+ + } -+ } +} diff -Nur --no-dereference smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-begin smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-begin --- smeserver-collabora-0.1.6.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-begin 1969-12-31 19:00:00.000000000 -0500