/[smeserver]/rpms/e-smith-manager/sme10/e-smith-manager-2.8.0-bz12129-httpd24.patch
ViewVC logotype

Contents of /rpms/e-smith-manager/sme10/e-smith-manager-2.8.0-bz12129-httpd24.patch

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


Revision 1.1 - (show annotations) (download)
Mon Jul 25 08:46:15 2022 UTC (2 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-manager-2_8_0-36_el7_sme, e-smith-manager-2_8_0-38_el7_sme, e-smith-manager-2_8_0-37_el7_sme, HEAD
Error occurred while calculating annotation data.
* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-36.sme
- update to httpd 2.4 access syntax [SME: 12129]

1 diff -Nur --no-dereference e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass
2 --- e-smith-manager-2.8.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass 2022-07-25 04:38:47.873000000 -0400
3 +++ e-smith-manager-2.8.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass 2022-07-25 04:43:41.827000000 -0400
4 @@ -21,17 +21,15 @@
5 $OUT .= " ProxyPassReverse /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place\n";
6
7 $OUT .= " <Location /$place>\n";
8 - $OUT .= " order deny,allow\n";
9 - $OUT .= " deny from all\n";
10 if ($port eq $httpPort)
11 {
12 - $OUT .= ' allow from 127.0.0.1' . "\n";
13 + $OUT .= ' Require ip 127.0.0.1' . "\n";
14 }
15 elsif (($haveSSL eq 'yes') && (($port eq $httpsPort) || ($plainTextAccess ne 'yes')))
16 {
17 - $OUT .= " allow from $localAccess $externalSSLAccess\n";
18 + $OUT .= " Require ip $localAccess $externalSSLAccess\n";
19 } else {
20 - $OUT .= " allow from $localAccess\n";
21 + $OUT .= " Require ip $localAccess\n";
22 }
23 $OUT .= " </Location>\n";
24 }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed