1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass mezzanine_patched_e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass |
2 |
|
|
--- e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass 2006-03-14 11:47:18.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_e-smith-apache-1.2.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27ManagerProxyPass 1969-12-31 19:00:00.000000000 -0500 |
4 |
|
|
@@ -1,28 +0,0 @@ |
5 |
|
|
-{ |
6 |
|
|
- # vim: ft=perl: |
7 |
|
|
- |
8 |
|
|
- $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no'; |
9 |
|
|
- $plainTextAccess = ${'httpd-admin'}{PermitPlainTextAccess} || 'no'; |
10 |
|
|
- |
11 |
|
|
- $OUT = ''; |
12 |
|
|
- foreach $place ('server-manager','server-common','user-password') |
13 |
|
|
- { |
14 |
|
|
- if (($port eq "80") && ($haveSSL eq 'yes') && ($plainTextAccess ne 'yes')) |
15 |
|
|
- { |
16 |
|
|
- $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}/$place\$1 [L,R]\n"; |
17 |
|
|
- } else { |
18 |
|
|
- $OUT .= " ProxyPass /$place http://127.0.0.1:${'httpd-admin'}{TCPPort}/$place/\n"; |
19 |
|
|
- } |
20 |
|
|
- |
21 |
|
|
- $OUT .= " <Location /$place>\n"; |
22 |
|
|
- $OUT .= " order deny,allow\n"; |
23 |
|
|
- $OUT .= " deny from all\n"; |
24 |
|
|
- if (($haveSSL eq 'yes') && (($port eq "443") || ($plainTextAccess ne 'yes'))) |
25 |
|
|
- { |
26 |
|
|
- $OUT .= " allow from $localAccess $externalSSLAccess\n"; |
27 |
|
|
- } else { |
28 |
|
|
- $OUT .= " allow from $localAccess\n"; |
29 |
|
|
- } |
30 |
|
|
- $OUT .= " </Location>\n"; |
31 |
|
|
- } |
32 |
|
|
-} |