smeserver-hwinfo/contribs8/smeserver-hwinfo-1.0-http.patch

--- smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/31hwInfoContent.http 2005-04-18 22:00:57.000000000 +0200
+++ smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/31hwInfoContent      2008-04-24 15:33:27.000000000 +0200
@@ -1,28 +0,0 @@
-{
-    my $hwinfoStatus = $hwinfo{'status'} || "disabled";
-
-    return "    # hwinfo is disabled in this VirtualHost" 
-       unless $hwinfoStatus eq 'enabled';
-
-    my $hwinfodir = '/home/httpd/html/hwinfo';
-
-    if ($port ne "443")
-    {
-       $OUT .= <<'HERE';
-    RewriteEngine on
-    RewriteRule ^/hwinfo   https://%{HTTP_HOST}/hwinfo [L,R]
-HERE
-    }
-    else
-    {
-        $OUT .= "    Alias       /hwinfo $hwinfodir\n";
-    }
-
-    # prevent unencrypted "backdoor" access 
-    if ($port ne '443')
-    {
-        $OUT .= "\n    <Location ~ \"/hwinfo/*\">\n";
-        $OUT .= "    SSLRequireSSL\n";
-        $OUT .= "    </Location>\n";
-    }
-}
--- smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HwInfoAccess.http       2005-04-18 21:59:04.000000000 +0200
+++ smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HwInfoAccess    2008-04-24 15:34:10.000000000 +0200
@@ -1,37 +0,0 @@
-#------------------------------------------------------------
-# hwInfo directory
-#------------------------------------------------------------
-
-
-{
-    #--------------------------------------------------------------
-    # Dependancy check, only execute hwinfo configuration if enabled.
-    #--------------------------------------------------------------
-
-    my $hwinfostatus = $hwinfo{'status'};
-
-    if (defined $hwinfostatus && $hwinfostatus eq 'enabled')
-    {
-    $OUT .= qq(
-# hwinfo configuration 
-
-<Directory /home/httpd/html/hwinfo>
-    Options Indexes Includes 
-    Options +Includes
-    AllowOverride None
-    order deny,allow
-    deny from all
-    allow from all
-    AuthName "Free-EOS Server Hardware Info"
-    AuthType Basic
-    AuthExternal pwauth
-    require user admin
-    Satisfy all
-</Directory>
-);
-    }
-    else
-    {
-       $OUT .= "# hwinfo not configured";
-    }
-}
1	--- smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/31hwInfoContent.http 2005-04-18 22:00:57.000000000 +0200
2	+++ smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/31hwInfoContent 2008-04-24 15:33:27.000000000 +0200
3	@@ -1,28 +0,0 @@
4	-{
5	- my $hwinfoStatus = $hwinfo{'status'} \|\| "disabled";
6	-
7	- return " # hwinfo is disabled in this VirtualHost"
8	- unless $hwinfoStatus eq 'enabled';
9	-
10	- my $hwinfodir = '/home/httpd/html/hwinfo';
11	-
12	- if ($port ne "443")
13	- {
14	- $OUT .= <<'HERE';
15	- RewriteEngine on
16	- RewriteRule ^/hwinfo https://%{HTTP_HOST}/hwinfo [L,R]
17	-HERE
18	- }
19	- else
20	- {
21	- $OUT .= " Alias /hwinfo $hwinfodir\n";
22	- }
23	-
24	- # prevent unencrypted "backdoor" access
25	- if ($port ne '443')
26	- {
27	- $OUT .= "\n <Location ~ \"/hwinfo/*\">\n";
28	- $OUT .= " SSLRequireSSL\n";
29	- $OUT .= " </Location>\n";
30	- }
31	-}
32	--- smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HwInfoAccess.http 2005-04-18 21:59:04.000000000 +0200
33	+++ smeserver-hwinfo-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HwInfoAccess 2008-04-24 15:34:10.000000000 +0200
34	@@ -1,37 +0,0 @@
35	-#------------------------------------------------------------
36	-# hwInfo directory
37	-#------------------------------------------------------------
38	-
39	-
40	-{
41	- #--------------------------------------------------------------
42	- # Dependancy check, only execute hwinfo configuration if enabled.
43	- #--------------------------------------------------------------
44	-
45	- my $hwinfostatus = $hwinfo{'status'};
46	-
47	- if (defined $hwinfostatus && $hwinfostatus eq 'enabled')
48	- {
49	- $OUT .= qq(
50	-# hwinfo configuration
51	-
52	-<Directory /home/httpd/html/hwinfo>
53	- Options Indexes Includes
54	- Options +Includes
55	- AllowOverride None
56	- order deny,allow
57	- deny from all
58	- allow from all
59	- AuthName "Free-EOS Server Hardware Info"
60	- AuthType Basic
61	- AuthExternal pwauth
62	- require user admin
63	- Satisfy all
64	-</Directory>
65	-);
66	- }
67	- else
68	- {
69	- $OUT .= "# hwinfo not configured";
70	- }
71	-}