--- 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 \n"; - $OUT .= " SSLRequireSSL\n"; - $OUT .= " \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 - - - 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 - -); - } - else - { - $OUT .= "# hwinfo not configured"; - } -}