changeset 1254:7adbc674e62c draft

Merge git://git.cathugger.ano/resdb
author epoch <epoch@hack.thebackupbox.net>
date Fri, 28 Aug 2020 23:47:12 +0000
parents ab42dc0b705b (diff) b144c060246d (current diff)
children b20cac81f3af
files
diffstat 7 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/whoisd/whoisd.pl	Mon Jun 08 19:50:02 2020 +0000
+++ b/contrib/whoisd/whoisd.pl	Fri Aug 28 23:47:12 2020 +0000
@@ -5,7 +5,8 @@
 use strict;
 
 #maybe chroot this whoisd?
-my $RESDB = "/services/resdb/resdb";
+#my $RESDB = "/services/resdb/resdb";
+my $RESDB = "/var/db/resdb";
 
 my $HACK=0;
 my $QUERY=<stdin>;
@@ -103,7 +104,7 @@
 }
 
 sub ASN_lookup {
- if($QUERY =~ m/^AS(.+?)$/) {
+ if($QUERY =~ m/^AS(.+?)$/i) {
   printf "%% AS section for %s\n", $QUERY;
   my $AS=$1;
   chdir("$RESDB/db/as") || die "%% error";
@@ -256,7 +257,7 @@
  #printf "%-20s %s\n", "notice:","$QUERY did not claim any domains yet";
 }
 
-if($QUERY =~ m/^AS(.+?)$/) {
+if($QUERY =~ m/^AS(.+?)$/i) {
  $user=get_user_from_ASN($1);
 }
 elsif($QUERY =~ m/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/) {
--- a/db/dom/ano/whois/ns/ns1.whois.ano	Mon Jun 08 19:50:02 2020 +0000
+++ b/db/dom/ano/whois/ns/ns1.whois.ano	Fri Aug 28 23:47:12 2020 +0000
@@ -1,1 +1,1 @@
-21.41.41.1
+21.41.41.5
--- a/db/dom/ano/whois/ns/ns2.whois.ano	Mon Jun 08 19:50:02 2020 +0000
+++ b/db/dom/ano/whois/ns/ns2.whois.ano	Fri Aug 28 23:47:12 2020 +0000
@@ -1,1 +1,1 @@
-fd63:1e39:6f73:2929::1
+fd63:1e39:6f73:2929::5
--- a/db/ip/15/29/29/ns/ns1.allowed.ano	Mon Jun 08 19:50:02 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-21.41.41.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/15/29/29/ns/ns1.whois.ano	Fri Aug 28 23:47:12 2020 +0000
@@ -0,0 +1,1 @@
+21.41.41.1
--- a/db/ip/15/29/29/ns/ns2.allowed.ano	Mon Jun 08 19:50:02 2020 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-fd63:1e39:6f73:2929::1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/15/29/29/ns/ns2.whois.ano	Fri Aug 28 23:47:12 2020 +0000
@@ -0,0 +1,1 @@
+fd63:1e39:6f73:2929::5