[interchange-cvs] interchange - kwalsh modified 2 files

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2007-09-27 21:43:30 GMT
Modified:  lib/Vend Config.pm
Modified:  dist     robots.cfg
Log:
    * Allow comments (starting with "#" and ending with EOL) in the
      Robot* directive lists.

    * Add more robots to the list.  Munax IPs suggested by Simon Bereux.

Revision  Changes    Path
2.224     +1 -0      interchange/lib/Vend/Config.pm


rev 2.224, prev_rev 2.223
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.223
retrieving revision 2.224
diff -u -r2.223 -r2.224
--- Config.pm	2 Sep 2007 21:42:36 -0000	2.223
+++ Config.pm	27 Sep 2007 21:43:30 -0000	2.224
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.223 2007/09/02 21:42:36 kwalsh Exp $
+# $Id: Config.pm,v 2.224 2007/09/27 21:43:30 kwalsh Exp $
 #
 # Copyright (C) 2002-2007 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -54,7 +54,7 @@
 use Vend::Data;
 use Vend::Cron;
 
-$VERSION = substr(q$Revision: 2.223 $, 10);
+$VERSION = substr(q$Revision: 2.224 $, 10);
 
 my %CDname;
 my %CPname;
@@ -1994,6 +1994,7 @@
 sub get_wildcard_list {
 	my($var, $value, $base) = @_;
 
+	$value =~ s/\s*#.*?$//mg;
 	$value =~ s/^\s+//;
 	$value =~ s/\s+$//;
 	return '' if ! $value;



2.9       +13 -0     interchange/dist/robots.cfg


rev 2.9, prev_rev 2.8
Index: robots.cfg
===================================================================
RCS file: /var/cvs/interchange/dist/robots.cfg,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -r2.8 -r2.9
--- robots.cfg	21 Sep 2007 00:51:32 -0000	2.8
+++ robots.cfg	27 Sep 2007 21:43:30 -0000	2.9
@@ -73,7 +73,9 @@
     marvin,
     Mediapartners,
     MegaSheep,
+    MEGAUPLOAD,
     Mercator,
+    MFC_Tear_Sample,
     Microsoft Data Access,
     Microsoft Office,
     Microsoft URL Control,
@@ -162,6 +164,17 @@
     216.200.130.207,
     216.35.103.6?,
     216.35.103.70,
+    82.99.30.?,		# Munax
+    82.99.30.1?,	# Munax
+    82.99.30.2?,	# Munax
+    82.99.30.3?,	# Munax
+    82.99.30.4?,	# Munax
+    82.99.30.5?,	# Munax
+    82.99.30.6?,	# Munax
+    82.99.30.70,	# Munax
+    82.99.30.71,	# Munax
+    82.99.30.72,	# Munax
+    82.99.30.73,	# Munax
 EOR
 
 RobotHost <<EOR