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

Diff of /rpms/smeserver-collabora/contribs10/smeserver-collabora-0.1.6-bz11895-Virtualhost.patch

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

Revision 1.1 by jpp, Wed Mar 23 03:16:58 2022 UTC Revision 1.3 by jpp, Wed Mar 23 03:36:26 2022 UTC
# Line 89  diff -Nur --no-dereference smeserver-col Line 89  diff -Nur --no-dereference smeserver-col
89  +}  +}
90  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  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
91  --- 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.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora        1969-12-31 19:00:00.000000000 -0500
92  +++ smeserver-collabora-0.1.6/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora    2022-03-22 23:05:15.297000000 -0400  +++ 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
93  @@ -0,0 +1,70 @@  @@ -0,0 +1,59 @@
94  +{  +{
 +  my $domain = $coolwsd{'VirtualHost'} || '';  
 +  
 +  if ($domain ne '') {  
95  +   if (($port eq "80") ){      +   if (($port eq "80") ){    
96  +  +
97  +    $OUT .= "  ServerName $domain\n";  +    $OUT .= "  ServerName $virtualHost\n";
98  +    $OUT .= "  Redirect permanent / https://$domain/ \n";  +    $OUT .= "  Redirect permanent / https://$virtualHost/ \n";
99  +    $OUT .= "\n";  +    $OUT .= "\n";
100  +   }  +   }
101  +   else {  +   else {
102  +  +
103  +    $OUT .= "  Options -Indexes\n";  +    $OUT .= "  Options -Indexes\n";
104  +  +
105  +    $OUT .= "  ServerName $domain\n";  +    $OUT .= "  ServerName $virtualHost\n";
106  +  +
107  +    $OUT .= "  SSLEngine on\n";  +    $OUT .= "  SSLEngine on\n";
108  +  +
# Line 149  diff -Nur --no-dereference smeserver-col Line 146  diff -Nur --no-dereference smeserver-col
146  +  +
147  +  +
148  +    $OUT .= "  # base\n";  +    $OUT .= "  # base\n";
 +    #$OUT .= "  RewriteRule ^/\$ http://127.0.0.1:9980/ [P,L] \n";  
149  +    $OUT .= "  ProxyPass / http://127.0.0.1:9980/ retry=0\n";  +    $OUT .= "  ProxyPass / http://127.0.0.1:9980/ retry=0\n";
150  +    $OUT .= "  ProxyPassReverse /  http://127.0.0.1:9980/\n";  +    $OUT .= "  ProxyPassReverse /  http://127.0.0.1:9980/\n";
 +#ProxyPassMatch \"^/\$\" http://127.0.0.1:9980/\n";  
 +#    $OUT .= "  <LocationMatch \"^/\$\">\n";  
 +#    $OUT .= "  ProxyPass http://127.0.0.1:9980/ retry=0\n";  
 +#    $OUT .= "  ProxyPassReverse  http://127.0.0.1:9980/\n";  
 +#    $OUT .= "  </LocationMatch> \n";  
 +  
151  +   }  +   }
 +  }  
152  +}  +}
153  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  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
154  --- 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  --- 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

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed