Changeset 73 for trunk/dnsbl/export-dnsbl

Timestamp:

09/05/25 16:04:46 (12 days ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

The "begin the cleanup from production" cleanup commit

• Move default DB connect info into DNSBL.pm
• Move configuration fragment loading into DNSBL.pm
• Change up configuration fragment to use %siteconfig instead of individual variables
• Normalize parts of locating the module to at least a "good enough" level
• if(0) out a chunk of export-dnsbl

Some things may be broken.

File:

• trunk/dnsbl/export-dnsbl (modified) (6 diffs)

trunk/dnsbl/export-dnsbl

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2009-2012,2014,2018 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2009-2012,2014,2018,2025 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -27 +27 @@
 use lib "$FindBin::RealBin/";
 
-use DNSBL 2.2;
-
-my $dnsbl = new DNSBL;
-
-# default DB info - all other settings should be loaded from the DB.
-my $dbhost = "localhost";
-my $dbname = "dnsbl";
-my $dbuser = "dnsbl";
-my $dbpass = "spambgone";
+use DNSBL 3.0;
 
 die "Need config argument\n" if !$ARGV[0];
 my $cfgname = shift @ARGV;
 
-# Load a config ref containing DB host, name, user, and pass info based on
-# from the server name + full script web path.  This allows us to host
-# multiple instances without having to duplicate the code.
-# This file is a Perl fragment to be processed inline.
-if (-e "/etc/dnsbl/$cfgname.conf") {
-  my $cfg = `cat /etc/dnsbl/$cfgname.conf`;
-  ($cfg) = ($cfg =~ /^(.+)$/s);         # avoid warnings, failures, and general nastiness with taint mode
-  eval $cfg;
-}
-
-my $dbh = $dnsbl->connect($dbhost, $dbname, $dbuser, $dbpass);
+my $dnsbl = new DNSBL (configfile => "/etc/dnsbl/$cfgname.conf");
+$dnsbl->connect;
 
 my %config;
@@ -61 +44 @@
 my %iplist;
 my $ipref = \%iplist;
+my @iplist2;
+my $ipref2 = \@iplist2;
 
 my $mode = $ARGV[0] || 'tiny';
@@ -66 +51 @@
 $dnsbl->initexport;
 #$dnsbl->export($ipref,$mode,1,'50.22.0.0/15');
-$dnsbl->export($ipref,$mode);
+#$dnsbl->export($ipref,$mode);
+$dnsbl->export_alt($ipref2, $mode);
+
 
 ##fixme - mode should pick actual output, not just export mode
@@ -77 +64 @@
 
   # more or less raw CIDR block-and-IP info.  rbldnsd format for convenience.
-  foreach (sort ipcmp keys %iplist) {
+
+
+
+if (0) {
+#  foreach (sort ipcmp keys %iplist) {
+  foreach (keys %iplist) {
     my $entry;
     if ($iplist{$_} == -1) {
@@ -104 +96 @@
     print $out;
   }
+}
+
+
 } else {
   # default "mode";  tinyDNS data format