ispman/bin ispman.loganalyzer,1.9,1.10 ispman.makelogs,1.24,1.25

Update of /cvsroot/ispman/ispman/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10161

Modified Files:
	ispman.loganalyzer ispman.makelogs 
Log Message:
added param for proper hostname generation
(fix from Andrew Williams)


Index: ispman.loganalyzer
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.loganalyzer,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ispman.loganalyzer	30 May 2004 23:35:32 -0000	1.9
+++ ispman.loganalyzer	8 Jul 2004 09:35:49 -0000	1.10
@@ -4,9 +4,9 @@
     unshift @INC,
       ( $FindBin::Bin, "$FindBin::Bin/../lib", "$FindBin::Bin/../conf" );
     use Getopt::Std;
-    getopt( 'c', \%opts );
+    getopt( 'ch', \%opts );
     unless ( $opts{'c'} && $ARGV[0] ) {
-        print "$0 -c /path/to/webalizer vhost_directory";
+        print "$0 -c /path/to/webalizer -h servername -d vhost_directory";
         print "\n";
         exit;
     }
@@ -14,6 +14,7 @@
 
 @dir       = @ARGV;
 $webalizer = $opts{'c'};
+$servername = $opts{'h'};
 
 $mon->{'Jan'} = 1;
 $mon->{'Feb'} = 2;
@@ -31,10 +32,10 @@
 for $dir (@dir) {
     next unless -d $dir;
     next unless -d "$dir/raw";
-    $sitename = $dir;
-    @sitename = split( "/", $dir );
-    $sitename =
-      join( '.', ( $sitename[$#sitename], $sitename[ $#sitename - 1 ] ) );
+#    $sitename = $dir;
+#    @sitename = split( "/", $dir );
+#    $sitename =
+#      join( '.', ( $sitename[$#sitename], $sitename[ $#sitename - 1 ] ) );
 
     chdir "$dir/raw" or die "Cant chdir";
 
@@ -56,7 +57,7 @@
 
     for $log (@logs) {
         $cmd =
-"$webalizer -p -n $sitename  -o $dir/report -t 'Log Report'  $dir/raw/$log\n";
+"$webalizer -p -n $servername  -o $dir/report -t 'Log Report'  $dir/raw/$log\n";
         if ( $opts{'n'} ) {
             print $cmd;
             next;

Index: ispman.makelogs
===================================================================
RCS file: /cvsroot/ispman/ispman/bin/ispman.makelogs,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ispman.makelogs	20 Jun 2004 09:38:11 -0000	1.24
+++ ispman.makelogs	8 Jul 2004 09:35:49 -0000	1.25
@@ -255,7 +255,7 @@
     if ( -e $webalizer ) {
         print "  Building report for $servername\n";
         my $cmd =
-"perl  $FindBin::Bin/ispman.loganalyzer -c $webalizer -d $vhostDirectory";
+"perl  $FindBin::Bin/ispman.loganalyzer -c $webalizer -h $servername -d $vhostDirectory";
         system($cmd);
     }
 }



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com