Changeset 25 for trunk/dnsbl/orgmove

Timestamp:

09/03/10 15:18:51 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Changes across the board to support multi-instance without code changes.
DB config is now loaded from a fragment in /etc/dnsbl, and the DB in turn
contains the autolist thresholds and some visual sugar for the web
interface so you know which DB you're dealing with.

File:

• trunk/dnsbl/orgmove (modified) (1 diff)

trunk/dnsbl/orgmove

@@ -10 +10 @@
 my $dnsbl = new DNSBL;
 
-my $dbh = $dnsbl->connect;
+# default DB info - all other settings should be loaded from the DB.
+my $dbhost = "localhost";
+my $dbname = "dnsbl";
+my $dbuser = "dnsbl";
+my $dbpass = "spambgone";
+
+die "Usage: orgmove <config name> <old orgid> <new orgid>\n" if !$ARGV[2];
+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);
 
 $dbh->{AutoCommit} = 0;