changeset 1122:a496c901e17a draft

Merge git://1.20.30.40
author SeekingFor <nobody@nowhere>
date Sun, 02 Jun 2013 03:23:51 +0000
parents 8e01b8361e9e (diff) 3e9b48fa77c7 (current diff)
children 743053608e2b
files
diffstat 9 files changed, 47 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/drugs/ns/a.ns.drugs.ano	Sun Jun 02 03:23:51 2013 +0000
@@ -0,0 +1,1 @@
+1.79.3.153
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/drugs/owner	Sun Jun 02 03:23:51 2013 +0000
@@ -0,0 +1,1 @@
+somebody
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/drugs/pcp/ns/a.ns.pcp.drugs	Sun Jun 02 03:23:51 2013 +0000
@@ -0,0 +1,1 @@
+1.79.3.153
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/drugs/pcp/owner	Sun Jun 02 03:23:51 2013 +0000
@@ -0,0 +1,1 @@
+somebody
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip6/F/D/6/3/1/E/3/9/6/F/7/3/2/9/2/9/cidr	Sun Jun 02 03:23:51 2013 +0000
@@ -0,0 +1,1 @@
+fd63:1e39:6f73:2929::/64
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip6/F/D/6/3/1/E/3/9/6/F/7/3/2/9/2/9/owner	Sun Jun 02 03:23:51 2013 +0000
@@ -0,0 +1,1 @@
+epoch
--- a/scripts/add_dom	Sun Jun 02 03:13:09 2013 +0000
+++ b/scripts/add_dom	Sun Jun 02 03:23:51 2013 +0000
@@ -4,15 +4,15 @@
  echo "Usage: $0 <dom> <owner> [<ns[/nsip]>...]" >&2; exit 255
 fi
 
-dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / | head -c -1)"
-mkdir "$dir" || exit 1
-echo "$2" > "$dir/owner"
-mkdir "$dir/ns" || exit 1
+dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / )"
+mkdir -p "$dir" || exit 1
+echo "$2" > "${dir}owner"
+mkdir "${dir}ns" || exit 1
 shift; shift;
 while [ x"$1" != x ]; do
  echo "$1" | tr / ' ' | (
   read ns nsip
-  echo "$nsip" > "$dir/ns/$ns"
+  echo "$nsip" > "${dir}ns/$ns"
  )
  shift;
 done
--- a/scripts/dec2hex	Sun Jun 02 03:13:09 2013 +0000
+++ b/scripts/dec2hex	Sun Jun 02 03:23:51 2013 +0000
@@ -1,4 +1,5 @@
 #!/bin/sh
+# maybe use? not sure if this would break anything. : printf "%02X" $1
 (
  if [ x"$USE_BC" = x1 ]; then
   echo -n "obase=16; "
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/nameserver_autogen/bind_tld_zonefile.sh	Sun Jun 02 03:23:51 2013 +0000
@@ -0,0 +1,35 @@
+#!/bin/bash
+#made for bash. not sure if all /bin/sh work.
+#be sure to edit these variables first.
+
+ANO_ZONEFILE=/etc/namedb/ano
+RESDB_PATH=/services/resdb/resdb
+
+echo "; this zonefile genreated on: `date`" > $ANO_ZONEFILE
+echo '$TTL 3600' >> $ANO_ZONEFILE
+echo '@ IN SOA localns root ('`date +" %Y%m%d00"`' 60 300 3600000 3600 )' >> $ANO_ZONEFILE
+echo '@ IN NS localns' >> $ANO_ZONEFILE
+echo 'localns IN A 127.0.0.1' >> $ANO_ZONEFILE
+
+cd ${RESDB_PATH}/db/dom/ano
+
+echo -n generating zonefile... 
+for name in *;do
+ if [ -e "${name}/ns/" ];then
+  for server in "$name"/ns/*;do
+   if grep '\.ano$' <<< $name > /dev/null;then
+    true
+   fi
+   if grep '\.ano$' <<< $server > /dev/null;then
+    true
+   fi
+   fqserver=`cut -d/ -f3- <<< $server`
+   echo -e "${name}\tIN NS\t${fqserver}."
+   for ip in `cat ${server}`;do 
+    echo -e "${fqserver}.\tIN A\t$ip"
+   done
+  done
+ fi
+done >> $ANO_ZONEFILE
+echo done.
+echo might want to send a sighup to your named now.