Updated so we don't scan as many ports for users running an identd.

diff --git a/bopm.conf.blitzed b/bopm.conf.blitzed
index 92f862f3b16f60b5ee82a19dcd137b9a55427c4f..9df5bea4e1d69e28ceb85378de4cb69d73cbdb69 100644 (file)
--- a/bopm.conf.blitzed
+++ b/bopm.conf.blitzed
@@ -8,7 +8,7 @@ the directives do, please see bopm.conf.sample.
 options {
        pidfile = "/some/path/bopm.pid";
        dns_fdlimit = 64;
-#       scanlog = "/some/path/scan.log";
+#      scanlog = "/some/path/scan.log";
 };
 
 
@@ -19,66 +19,60 @@ IRC {
        username = "bopm";
        server = "servername.blitzed.org";
        port = 6667;
-        nickserv = "nickserv :identify bopm-nick-password";
+       nickserv = "nickserv :identify bopm-nick-password";
        oper = "bopm operpass";
-        mode = "+Fc-h";
+       mode = "+Fc-h";
        away = "I'm a bot.  Your messages will be ignored.";
 
        channel {
-           /*
-            * This is where all of Blitzed's bopms are.  The name "#wg" is
-            * left over from the days of dalnet's wgmon.  Please don't put
-            * your bopm into any other channels as it spews out some sensitive
-            * info from time to time.
-            */
-          name = "#wg";
-
-           /*
-            * Make sure your bopm is set to ID to its nick, and that it has
-            * access enough in #wg to use the chanserv invite command.
-            */
-           invite = "chanserv :invite #wg";
+               /*
+                * This is where all of Blitzed's bopms are.  The name "#wg" is
+                * left over from the days of dalnet's wgmon.  Please don't put
+                * your bopm into any other channels as it spews out some sensitive
+                * info from time to time.
+                */
+               name = "#wg";
+
+               /*
+                * Make sure your bopm is set to ID to its nick, and that it has
+                * access enough in #wg to use the chanserv invite command.
+                */
+               invite = "chanserv :invite #wg";
        };
 
        /* Hybrid / Bahamut / Unreal (in HCN mode) */
        connregex = "\\*\\*\\* Notice -- Client connecting: ([^ ]+) \\(([^@]+)@([^\\)]+)\\) \\[([0-9\\.]+)\\].*";
 
        /*
-         * "kline" controls the command used when an open proxy is confirmed.
-         *
+        * "kline" controls the command used when an open proxy is confirmed.
+        *
         *  %n     User's nick
         *  %u     User's username
         *  %h     User's irc hostname
         *  %i     User's IP address
-         *
+        *
         */
        kline = "KLINE *@%h :Open Proxy found on your host. Please visit www.blitzed.org/proxy?ip=%i for more information.";
 };
 
 
 OPM {
-        blacklist = "opm.blitzed.org";
-        dnsbl_from = "yournick@blitzed.org";
-        dnsbl_to = "bopm@reports.blitzed.org";
-        sendmail = "/usr/sbin/sendmail";
+       blacklist = "opm.blitzed.org";
+       dnsbl_from = "yournick@blitzed.org";
+       dnsbl_to = "bopm@reports.blitzed.org";
+       sendmail = "/usr/sbin/sendmail";
 };
 
 scanner {
-       name="blitzed";
+       name = "default";
 
-        /*
-         * An extensive range of ports and protocols.  If any non-blitzed
-         * admins are reading this, you might not want to use this many if you
-         * have a very busy server.  This is 20 FDs per user.
-         */
+       /*
+        * Any user will get scanned on these protocols.
+        */
        protocol = HTTP:80;
-       protocol = HTTP:81;
        protocol = HTTP:3128;
-       protocol = HTTP:6588;
-       protocol = HTTP:8000;
-       protocol = HTTP:8001;
+       protocol = HTTP:6588; /* AnalogX proxy */
        protocol = HTTP:8080;
-       protocol = HTTP:8081;
 
        protocol = SOCKS4:1080;
        protocol = SOCKS5:1080;
@@ -88,34 +82,77 @@ scanner {
        protocol = WINGATE:23;
 
        protocol = HTTPPOST:80;
-       protocol = HTTPPOST:81;
        protocol = HTTPPOST:3128;
+
+#      vhost = "127.0.0.1";
+
+       fd = 512;
+
+       max_read = 4096;
+       timeout = 30;
+
+       /* Don't forget to change this to the public IP of your server! */
+       /* Also don't forget to change these settings in the extra scanner block too! */
+       target_ip     = "127.0.0.1";
+       target_port   = 6667;
+
+       /* Don't forget to change this to have your FULL server name here! */
+       target_string = ":somese.rv.er.blitzed.org NOTICE AUTH :*** Looking up your hostname...";
+       target_string = "ERROR :Your host is trying to (re)connect too fast -- throttled.";
+};
+
+scanner {
+       name = "extra";
+
+       protocol = HTTP:81;
+       protocol = HTTP:8000;
+       protocol = HTTP:8001;
+       protocol = HTTP:8081;
+
+       protocol = HTTPPOST:81;
        protocol = HTTPPOST:6588;
        protocol = HTTPPOST:8000;
        protocol = HTTPPOST:8001;
        protocol = HTTPPOST:8080;
        protocol = HTTPPOST:8081;
 
-#       vhost = "127.0.0.1";
+#      vhost = "127.0.0.1";
 
-        /* Should be OK for Blitzed even with this many protocols. */
-       fd = 512;
+       /* Less fds are given to this scanner */
+       fd = 256;
 
        max_read = 4096;
        timeout = 30;
 
-        /* Don't forget to change this to the public IP of your server! */
-        target_ip     = "127.0.0.1";
+       /* Don't forget to change this to the public IP of your server! */
+       target_ip     = "127.0.0.1";
        target_port   = 6667;
 
-        /* Don't forget to change this to have your FULL server name here! */
-        target_string = ":somese.rv.er.blitzed.org NOTICE AUTH :*** Looking up your hostname...";
+       /* Don't forget to change this to have your FULL server name here! */
+       target_string = ":somese.rv.er.blitzed.org NOTICE AUTH :*** Looking up your hostname...";
        target_string = "ERROR :Your host is trying to (re)connect too fast -- throttled.";
 };
 
 user {
+       scanner = "default";
        mask = "*!*@*";
-       scanner = "blitzed";
+};
+
+user {
+       scanner = "extra";
+       /* If the user matches any of these masks they will get the extra scans too */
+
+       /* Connections without ident will match on a vast number of connections
+        * very few proxies run ident though */
+       mask = "*!~*@*";
+       mask = "*!squid@*";
+       mask = "*!nobody@*";
+       mask = "*!www-data@*";
+       mask = "*!cache@*";
+       mask = "*!CacheFlowS@*";
+       mask = "*!*@*www*";
+       mask = "*!*@*proxy*";
+       mask = "*!*@*cache*";
 };
 
 /*