syslog for foo

4 files changed, 26 insertions, 17 deletions

diff --git a/frontends/Rexfile b/frontends/Rexfile
index eff2776..a7364bb 100644
--- a/frontends/Rexfile
+++ b/frontends/Rexfile
@@ -538,10 +538,11 @@ task 'foostats',
   group => 'frontends',
   sub {
     use File::Copy;
-    my $git_script_path = $ENV{HOME} . '/git/foostats/foostats.pl';
-    copy( $git_script_path, './scripts/foostats.pl' ) if -f $git_script_path;
-    my $git_odds_path = $ENV{HOME} . '/git/foostats/odds.txt';
-    copy( $git_odds_path, './scripts/odds.txt' ) if -f $git_odds_path;
+    for my $file (qw/foostats.pl fooodds.txt/) {
+        Rex::Logger::info("Dealing with $file");
+        my $git_script_path = $ENV{HOME} . '/git/foostats/' . $file;
+        copy( $git_script_path, './scripts/' . $file ) if -f $git_script_path;
+    }
 
     file '/usr/local/bin/foostats.pl',
       source => './scripts/foostats.pl',
@@ -549,8 +550,8 @@ task 'foostats',
       group  => 'wheel',
       mode   => '500';
 
-    file '/var/www/htdocs/buetow.org/self/foostats/odds.txt',
-      source => './scripts/odds.txt',
+    file '/var/www/htdocs/buetow.org/self/foostats/fooodds.txt',
+      source => './scripts/fooodds.txt',
       owner  => 'root',
       group  => 'wheel',
       mode   => '440';
diff --git a/frontends/etc/newsyslog.conf b/frontends/etc/newsyslog.conf
index 9e401ca..bbd1aa5 100644
--- a/frontends/etc/newsyslog.conf
+++ b/frontends/etc/newsyslog.conf
@@ -11,3 +11,4 @@
 /var/log/pflog				600  3     250  *     ZB "pkill -HUP -u root -U root -t - -x pflogd"
 /var/www/logs/access.log		644  14    *    $W0   Z "pkill -USR1 -u root -U root -x httpd"
 /var/www/logs/error.log			644  7     250  *     Z "pkill -USR1 -u root -U root -x httpd"
+/var/log/fooodds			640  7     300  *     Z
diff --git a/frontends/scripts/odds.txt b/frontends/scripts/fooodds.txt
index 489b2e0..3fee942 100644
--- a/frontends/scripts/odds.txt
+++ b/frontends/scripts/fooodds.txt
@@ -14,3 +14,10 @@ robots.txt
 wordpress
 /wp
 .rar
+/config.json
+/sitemap.xml
+/actuator/health
+/portal/redlion
+/SDK
+/bin/sh
+.js
diff --git a/frontends/scripts/foostats.pl b/frontends/scripts/foostats.pl
index 353a50c..dacf733 100644
--- a/frontends/scripts/foostats.pl
+++ b/frontends/scripts/foostats.pl
@@ -249,8 +249,8 @@ package Foostats::Logreader {
         };
     }
 
-    sub parse_logs ( $last_web_date, $last_gemini_date, $odds_file, $filter_log ) {
-        my $agg = Foostats::Aggregator->new( $odds_file, $filter_log );
+    sub parse_logs ( $last_web_date, $last_gemini_date, $odds_file, $odds_log ) {
+        my $agg = Foostats::Aggregator->new( $odds_file, $odds_log );
 
         say "Last web date: $last_web_date";
         say "Last gemini date: $last_gemini_date";
@@ -358,9 +358,9 @@ package Foostats::Aggregator {
         GEMFEED_URI_2 => '/gemfeed/',
     };
 
-    sub new ( $class, $odds_file, $filter_log ) {
+    sub new ( $class, $odds_file, $odds_log ) {
         bless {
-            filter => Foostats::Filter->new( $odds_file, $filter_log ),
+            filter => Foostats::Filter->new( $odds_file, $odds_log ),
             stats  => {}
           },
           $class;
@@ -689,13 +689,13 @@ package main {
     use Getopt::Long;
     use Sys::Hostname;
 
-    sub parse_logs ( $stats_dir, $odds_file, $filter_log ) {
+    sub parse_logs ( $stats_dir, $odds_file, $odds_log ) {
         my $out = Foostats::FileOutputter->new( stats_dir => $stats_dir );
 
         $out->{stats} = Foostats::Logreader::parse_logs(
             $out->last_processed_date('web'),
             $out->last_processed_date('gemini'),
-            $odds_file, $filter_log
+            $odds_file, $odds_log
         );
 
         $out->write;
@@ -704,9 +704,9 @@ package main {
     my ( $parse_logs, $replicate, $report, $all );
 
     # With default values
-    my $stats_dir  = '/var/www/htdocs/buetow.org/self/foostats';
-    my $odds_file  = $stats_dir . '/odds.txt';
-    my $filter_log = '/var/log/foofilter';
+    my $stats_dir = '/var/www/htdocs/buetow.org/self/foostats';
+    my $odds_file = $stats_dir . '/fooodds.txt';
+    my $odds_log  = '/var/log/fooodds';
     my $partner_node =
       hostname eq 'fishfinger.buetow.org'
       ? 'blowfish.buetow.org'
@@ -715,7 +715,7 @@ package main {
     # TODO: Add help output
     GetOptions
       'parse-logs!'    => \$parse_logs,
-      'filter-log=s'   => \$filter_log,
+      'filter-log=s'   => \$odds_log,
       'odds-file=s'    => \$odds_file,
       'replicate!'     => \$replicate,
       'report!'        => \$report,
@@ -723,7 +723,7 @@ package main {
       'stats-dir=s'    => \$stats_dir,
       'partner-node=s' => \$partner_node;
 
-    parse_logs( $stats_dir, $odds_file, $filter_log )
+    parse_logs( $stats_dir, $odds_file, $odds_log )
       if $parse_logs
       or $all;