Update | 23 ++++++++++------------- Update.Fast | 15 ++++++--------- dbl_expand | 8 ++------ 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/Update b/Update index db3cc88..d7eef9d 100755 --- a/Update +++ b/Update @@ -2,16 +2,13 @@ use File::Copy; -$login=""; -$pass=""; -$WGET="/usr/bin/wget"; -$dir="/usr/local/rejik3/dbl"; +require "/etc/squid/redirector/dbl/dbl.conf"; # Write log function sub wlog { my ($sec, $min, $hour, $mday, $mon, $year) = localtime ; - open (LOG,">>$dir/update.log") or die "Can't open $dir/update.log log: $!\n"; + open (LOG,">>$logdir/update.log") or die "Can't open $logdir/update.log log: $!\n"; printf LOG "%4d-%02d-%02d %2d:%02d:%02d %s\n", $year + 1900,$mon+1, $mday, $hour, $min, $sec,$_[0]; close (LOG); } @@ -29,11 +26,11 @@ $dir="/usr/local/rejik3/dbl"; # Download new file's wlog("Download new files (curent local version is $version)"); - $ret=system("$WGET -t 1 -o $dir/wget.log \"http://rejik.ru/cgi-bin/download2.cgi?Login=$login\&Pass=$pass\&Version=$version\" -O $dir/new.tmp"); + $ret=system("$WGET -t 1 -o $logdir/wget.log \"http://rejik.ru/cgi-bin/download2.cgi?Login=$login\&Pass=$pass\&Version=$version\" -O $dir/new.tmp"); if ($ret!=0) { - wlog("Can't download. See $dir/wget.log for error\n"); + wlog("Can't download. See $logdir/wget.log for error\n"); exit; } @@ -52,10 +49,10 @@ $dir="/usr/local/rejik3/dbl"; wlog("Untar new files to $dir/NEW"); system("rm -f $dir/NEW/*; rmdir $dir/NEW"); system("mkdir $dir/NEW"); - $ret=system("tar xf $dir/new.tmp -C $dir/NEW >$dir/tar.log 2>$dir/tar.log"); + $ret=system("tar xf $dir/new.tmp -C $dir/NEW >$logdir/tar.log 2>$logdir/tar.log"); if ($ret!=0) { - wlog("Can't untar. Command \"tar xzf $dir/new.tmp -C $dir/NEW >$dir/tar.log 2>$dir/tar.log\" return error. See $dir/tar.log for error\n"); + wlog("Can't untar. Command \"tar xzf $dir/new.tmp -C $dir/NEW >$logdir/tar.log 2>$logdir/tar.log\" return error. See $logdir/tar.log for error\n"); exit; } @@ -76,7 +73,7 @@ $dir="/usr/local/rejik3/dbl"; print VER "$1"; close (VER); - unlink("$dir/new.tmp","$dir/tar.log","$dir/wget.log"); + unlink("$dir/new.tmp","$logdir/tar.log","$logdir/wget.log"); wlog("Copy new file to $dir/list.dbl\n"); exit; } @@ -84,7 +81,7 @@ $dir="/usr/local/rejik3/dbl"; # Check for NONE file if ($files[0] eq "NONE") { - unlink("$dir/new.tmp","$dir/tar.log","$dir/wget.log"); + unlink("$dir/new.tmp","$logdir/tar.log","$logdir/wget.log"); wlog("New data not found. You have last version.\n"); exit; } @@ -92,7 +89,7 @@ $dir="/usr/local/rejik3/dbl"; # Check for SCORE file if ($files[0] eq "SCORE") { - unlink("$dir/new.tmp","$dir/tar.log","$dir/wget.log"); + unlink("$dir/new.tmp","$logdir/tar.log","$logdir/wget.log"); wlog("You dont have score to download dbl list.\n"); exit; } @@ -153,5 +150,5 @@ $dir="/usr/local/rejik3/dbl"; # Delete temp files - unlink("$dir/new.tmp","$dir/tar.log","$dir/wget.log","$dir/list.tmp"); + unlink("$dir/new.tmp","$logdir/tar.log","$logdir/wget.log","$dir/list.tmp"); diff --git a/Update.Fast b/Update.Fast index 1553c7d..9992597 100755 --- a/Update.Fast +++ b/Update.Fast @@ -2,16 +2,13 @@ use File::Copy; -$login=""; -$pass=""; -$WGET="/usr/bin/wget"; -$dir="/usr/local/rejik3/dbl"; +require "/etc/squid/redirector/dbl/dbl.conf"; # Write log function sub wlog { my ($sec, $min, $hour, $mday, $mon, $year) = localtime ; - open (LOG,">>$dir/update.fast.log") or die "Can't open $dir/update.fast.log log: $!\n"; + open (LOG,">>$logdir/update.fast.log") or die "Can't open $logdir/update.fast.log log: $!\n"; printf LOG "%4d-%02d-%02d %2d:%02d:%02d %s\n", $year + 1900,$mon+1, $mday, $hour, $min, $sec,$_[0]; close (LOG); } @@ -20,11 +17,11 @@ $dir="/usr/local/rejik3/dbl"; # Download new data wlog("Download new data"); - $ret=system("$WGET -t 1 -o $dir/wget.log \"http://rejik.ru/cgi-bin/fast_get2.cgi?Login=$login\&Pass=$pass\" -O $dir/new.tmp"); + $ret=system("$WGET -t 1 -o $logdir/wget.log \"http://rejik.ru/cgi-bin/fast_get2.cgi?Login=$login\&Pass=$pass\" -O $dir/new.tmp"); if ($ret!=0) { - wlog("Can't download. See $dir/wget.log for error\n"); + wlog("Can't download. See $logdir/wget.log for error\n"); exit; } @@ -50,5 +47,5 @@ $dir="/usr/local/rejik3/dbl"; wlog("New data now aviable in $dir/fast.dbl"); # Delete temp files - unlink("$dir/new.tmp","$dir/wget.log"); - \ No newline at end of file + unlink("$dir/new.tmp","$logdir/wget.log"); + diff --git a/dbl_expand b/dbl_expand index 45e6615..9951920 100755 --- a/dbl_expand +++ b/dbl_expand @@ -2,11 +2,7 @@ use XML::Parser; use Text::Iconv; -$my_nick=""; -$min_trust=300; -@good_guys=("slava"); -@bad_guys=("test"); -$dir="/usr/local/rejik3/dbl"; +require "/etc/squid/redirector/dbl/dbl.conf"; ## Init some vars %files=(); @@ -244,4 +240,4 @@ $dir="/usr/local/rejik3/dbl"; print {$files{$group}} "$rule\n"; } - \ No newline at end of file +