Debian JP master SVN www commits (rev.870)

[Debian JP webadmin <webadmin@debian.or.jp>]

=======================================================
Repository: /org/svn.debian.or.jp/repos
  Revision: 870
  Commiter: yasu
      Date: 2009-04-10 17:52:08 +0900 (金, 10  4月 2009)
=======================================================
Log:

Default to use GeoIP

=======================================================
Changed:

U   cdn/trunk/DNS-Balance/ChangeLog
U   cdn/trunk/DNS-Balance/dns_balance.rb
D   cdn/trunk/lists_deb_cdn_araki_net.rb
D   cdn/trunk/lists_jp_cdn_araki_net.rb

Modified: cdn/trunk/DNS-Balance/ChangeLog
===================================================================
--- cdn/trunk/DNS-Balance/ChangeLog	2009-04-10 06:31:44 UTC (rev 869)
+++ cdn/trunk/DNS-Balance/ChangeLog	2009-04-10 08:52:08 UTC (rev 870)
@@ -1,3 +1,8 @@
+2009-04-10  ARAKI Yasuhiro  <ar@debian.org>
+
+	* dns_balance.rb (select_namespace): Change: Default surrogates are select from NorthAmerica.
+	(run): Change to use "GeoIP" as defaut. (no need to use --geoip)
+
 2008-02-05  ARAKI Yasuhiro  <ar@debian.org>
 
 	* dns_balance.rb: 

Modified: cdn/trunk/DNS-Balance/dns_balance.rb
===================================================================
--- cdn/trunk/DNS-Balance/dns_balance.rb	2009-04-10 06:31:44 UTC (rev 869)
+++ cdn/trunk/DNS-Balance/dns_balance.rb	2009-04-10 08:52:08 UTC (rev 870)
@@ -153,7 +153,8 @@
     end
   end
 
-  return "default"
+#  return "default"
+  return "NA"
 end
 
 def geoip_search_country(str)
@@ -429,6 +430,11 @@
     OPT["country"] = true
     OPT["continent"] = true
   }
+  opt.on("--no-geoip", "Disable GeoIP ") {
+    OPT["country"] = false
+    OPT["continent"] = false
+    OPT["nogeoip"] = true
+  }
   opt.on("--country", "Enable Country by GeoIP ") {
     OPT["country"] = true
   }
@@ -447,10 +453,15 @@
   }
   opt.parse!
 }
+unless OPT["nogeoip"] == true
+  OPT["country"] = true
+  OPT["continent"] = true
+end
 OPT.freeze
 
 ML = MultiLog::new
 
+
 if OPT["unfork"]
   if OPT["logfile"]
     fd = open($logfile, "w")

Deleted: cdn/trunk/lists_deb_cdn_araki_net.rb
===================================================================
--- cdn/trunk/lists_deb_cdn_araki_net.rb	2009-04-10 06:31:44 UTC (rev 869)
+++ cdn/trunk/lists_deb_cdn_araki_net.rb	2009-04-10 08:52:08 UTC (rev 870)
@@ -1,16 +0,0 @@
-$tracefile = 'hanzubon.jp' # hanzubon 2007apr5
-$first_surrogate = '61.115.118.67'
-
-$surrogates = {
-  '203.178.137.175' => '9000', # naist
-  '61.115.118.67' => '1000', # hanzubon 2007apr5
-  '210.157.158.38' => '9900', # plat
-  '202.229.186.27' => '20', # topstudio
-  '133.5.166.3' => '10', # dennou-q.gfd-dennou.org
-  '130.54.59.159' => '10', # dennou-k.gfd-dennou.org
-  '133.87.45.30' => '10', # dennou-h.gfd-dennou.org
-  '61.206.119.174' => '20', # oyu-net.jp
-##  '219.111.15.135' => '1000', # tagoh
-#  '15.12.218.222' => '9900', # fail data for test
-#  '210.157.158.59' => '9900' ## fail data for test
-}

Deleted: cdn/trunk/lists_jp_cdn_araki_net.rb
===================================================================
--- cdn/trunk/lists_jp_cdn_araki_net.rb	2009-04-10 06:31:44 UTC (rev 869)
+++ cdn/trunk/lists_jp_cdn_araki_net.rb	2009-04-10 08:52:08 UTC (rev 870)
@@ -1,16 +0,0 @@
-$tracefile = 'hanzubon.jp' # hanzubon 2007apr5
-$first_surrogate = '61.115.118.67'
-
-$surrogates = {
-  '203.178.137.175' => '9000', # naist
-  '61.115.118.67' => '1000', # hanzubon 2007apr5
-  '210.157.158.38' => '9900', # plat
-  '202.229.186.27' => '20', # topstudio
-  '133.5.166.3' => '10', # dennou-q.gfd-dennou.org
-  '130.54.59.159' => '10', # dennou-k.gfd-dennou.org
-  '133.87.45.30' => '10', # dennou-h.gfd-dennou.org
-  '61.206.119.174' => '20', # oyu-net.jp
-##  '219.111.15.135' => '1000', # tagoh
-#  '15.12.218.222' => '9900', # fail data for test
-#  '210.157.158.59' => '9900' ## fail data for test
-}