commit und geh weg

[people/pmueller/ipfire-2.x.git] / config / updxlrator / updxlrator

diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator
index 4f54d429e3b5b60d34175d99b79f8a51571a11da..a7a7358492287fd705d2a3c21188b8628438e20e 100644 (file)
--- a/config/updxlrator/updxlrator
+++ b/config/updxlrator/updxlrator
@@ -55,7 +55,7 @@ if (-e "$swroot/updatexlrator/settings")
        if ($xlratorsettings{'ENABLE_LOG'} eq 'on') { $logging=1; };
        if ($xlratorsettings{'PASSIVE_MODE'} eq 'on') { $passive_mode=1; };
        $maxusage=$xlratorsettings{'MAX_DISK_USAGE'};
-       if ($xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} eq 'on') { $nice='/usr/bin/nice --adjustment=15 '; };
+       if ($xlratorsettings{'LOW_DOWNLOAD_PRIORITY'} eq 'on') { $nice='/bin/nice --adjustment=15 '; };
 }
 if (!$maxusage) { $maxusage=75; };
 
@@ -107,8 +107,26 @@ while (<>) {
        {
                $from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Symantec");
        }
-
+       
+       # -----------------------------------------------------------
+       # Section: Avira Downloads
        # -----------------------------------------------------------
+       
+       if ($dsturl =~ m@^http://dl[0-9]\.avgate\.net/.*\.(htm|html|gz)$@i)
+       {
+       $from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Avira");
+       }
+       
+       # ----------------------------------------------------------- 
+       # Section: Avast Downloads 
+       # -----------------------------------------------------------  
+       
+       if ($dsturl =~ m@^http://download[0-99]\.avast\.com/.*\.(exe|zip|vps|stamp|vpu)$@i) 
+       { 
+       $from_local_cache = &cache_access($dsturl,$hostaddr,$username,"Avast"); 
+       } 
+       
+       # ----------------------------------------------------------- 
 
        }