Merge branch 'master' of ssh://github.com/tech-server/tgmanage

5 files changed, 29 insertions, 74 deletions

diff --git a/tools/generate-dnsrr.pl b/tools/generate-dnsrr.pl
index ad9230c..99ff395 100755
--- a/tools/generate-dnsrr.pl
+++ b/tools/generate-dnsrr.pl
@@ -19,6 +19,9 @@
 #  Command-syntax to send this to nsupdate, running it on the DNS server:
 #  cat file.txt | tools/generate-dnsrr.pl --dom foo -ns | ssh $dnsserver "nsupdate -k /etc/bind/Kdhcp_updater.+157+XXXXX"
 #
+#  Generate DNS for linknets:
+#  cat /tmp/linknets.txt | perl -wple 's,;, ,g' | perl tools/make-linknet-hosts.pl | tools/generate-dnsrr.pl --domain tgXX.gathering.org -ns -rev | ssh $dnsserver "nsupdate -k /etc/bind/Kdhcp_updater.XXXXX"
+#
 # Format of input:
 # hostname  ipv4-adress ipv6-address
 #  If any of ipv4-address or ipv6-address are NOT set for the host, specify "nope"
@@ -99,7 +102,6 @@ sub print_ptr{
 	unless ( $ipv4 eq "nope" ) {
 		my $v4 = new Net::IP($ipv4);
 		
-		print "prereq nxdomain " . $v4->reverse_ip() . "\n" unless $delete;
 		print "update add " . $v4->reverse_ip() . " 3600 IN PTR " . $hostname . $domain .".\n" unless $delete;
 		print "update delete "  . $v4->reverse_ip() . " IN PTR\n" if $delete;
 		print "send\n";
@@ -109,7 +111,6 @@ sub print_ptr{
 	if (( not ($ipv6 eq "nope") ) && ( $ipv6 )) {
 		my $v6 = new Net::IP($ipv6);
 		
-		print "prereq nxdomain " . $v6->reverse_ip() . "\n" unless $delete;
 		print "update add " . $v6->reverse_ip() . " 3600 IN PTR " . $hostname . $domain . ".\n" unless $delete;
 		print "update delete " . $v6->reverse_ip() . " IN PTR\n" if $delete;
 		print "send\n";
diff --git a/tools/generate-rowdns.pl b/tools/generate-rowdns.pl
index 075cae0..a7b9aef 100755
--- a/tools/generate-rowdns.pl
+++ b/tools/generate-rowdns.pl
@@ -99,4 +99,4 @@ if($json_content){
 		}
 	        print "send\n";
 	}
-}
\ No newline at end of file
+}
diff --git a/tools/make-accesspoints.pl b/tools/make-accesspoints.pl
deleted file mode 100755
index b84321a..0000000
--- a/tools/make-accesspoints.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/perl
-use strict;
-use warnings;
-
-while (<>) {
-	my @arr = split " ";
-	my $ap = 'ap-'.$arr[0];
-	my $core = $arr[1];
-	# Trekk fra 1
-	$core =~ s/^(distro)(\d+)$/$1.($2-1)/e;
-
-	# Fjerde kabel er aksesspunkt
-	my $blade;
-	my $port;
-	if ($arr[5] =~ /^Gi(\d+)\/(\d+)$/) {
-		$blade = $1;
-		$port = $2;
-	} else {
-		die "Unknown port: ".$arr[5];
-	}
-	printf "INSERT INTO switches(ip, sysname, switchtype) values(inet '127.0.0.1', '%s', 'ciscoap');\n", $ap;
-	printf "INSERT INTO uplinks SELECT (SELECT switch FROM switches WHERE sysname = '%s') AS switch, (SELECT switch FROM switches WHERE sysname = '%s') AS coreswitch, %d AS blade, %d AS port;\n", $ap, $core, $blade, $port;
-	printf "INSERT INTO ap_poll(switch) SELECT switch FROM switches WHERE sysname = '%s';\n", $ap;
-}
diff --git a/tools/make-linknet-hosts.pl b/tools/make-linknet-hosts.pl
index 1db630a..c00e81b 100755
--- a/tools/make-linknet-hosts.pl
+++ b/tools/make-linknet-hosts.pl
@@ -24,21 +24,35 @@ while (<STDIN>) {
 	
 	my ($ipv4_raw, $ipv6_raw, $from, $to) = split;
 		
-	# v4 
-	my $ipv4_first = NetAddr::IP->new($ipv4_raw);
-	my $ipv4_second = $ipv4_first + 1;
-	
-	# v6
-	my $ipv6_first = NetAddr::IP->new($ipv6_raw);
-	my $ipv6_second = $ipv6_first + 1;
+	my ($ipv4_first, $ipv4_second, $ipv6_first, $ipv6_second);
+	if($ipv6_raw =~ m/nope/){
+		$ipv6_first = "nope";
+		$ipv6_second = "nope";
+	} else {
+		my $ipv6 = NetAddr::IP->new($ipv6_raw);
+		$ipv6_first = $ipv6->addr();
+		$ipv6++;
+		$ipv6_second = $ipv6->addr();
+	}
+
+	if($ipv4_raw =~ m/nope/){
+		$ipv4_first = "";
+                $ipv4_second = "";
+	} else {
+		my $ipv4 = NetAddr::IP->new($ipv4_raw);
+		$ipv4_first = $ipv4->addr();
+		$ipv4++;
+		$ipv4_second = $ipv4->addr;
+	}
+
 
 	# generate-dnsrr.pl format:
 	# hostname ipv4 ipv6
 	if($first){
-		printf("%s %s %s\n", $from, $ipv4_first->addr, $ipv6_first->addr);
-		printf("%s %s %s\n", $to, $ipv4_second->addr, $ipv6_second->addr);
+		printf("%s %s %s\n", $from, $ipv4_first, $ipv6_first);
+		printf("%s %s %s\n", $to, $ipv4_second, $ipv6_second);
 	} else {
-		printf("%s-%s %s %s\n", $from, $to, $ipv4_first->addr, $ipv6_first->addr);
-		printf("%s-%s %s %s\n", $to, $from, $ipv4_second->addr, $ipv6_second->addr);
+		printf("%s-%s %s %s\n", $from, $to, $ipv4_first, $ipv6_first);
+		printf("%s-%s %s %s\n", $to, $from, $ipv4_second, $ipv6_second);
 	}
 }
diff --git a/tools/make-switches.pl b/tools/make-switches.pl
deleted file mode 100755
index c0c842a..0000000
--- a/tools/make-switches.pl
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /usr/bin/perl
-
-use strict;
-use warnings;
-
-my $switchtype = "ex2200";
-
-print "begin;\n";
-print "delete from temppoll;\n";
-print "delete from dhcp;\n";
-print "delete from switches where switchtype = '$switchtype';\n";
-#print "SELECT pg_catalog.setval('switches_switch_seq', 1, false);\n";
-print "SELECT pg_catalog.setval('polls_poll_seq', 1, false);\n";
-
-my %ip;
-my $i = 1;
-while (<STDIN>) {
-	chomp;
-	my @info = split(/ /);
-
-	if (scalar @info < 5) {
-		die "Unknown line: $_";
-	}
-
-	my $name = $info[0];
-	my $range = $info[1];
-	my $ip = $info[3];
-	$ip =~ s/\/.*$//;
-
-
-	print "insert into switches (ip, sysname, switchtype) values ('$ip', '$name', '$switchtype');\n";
-	print "insert into dhcp select switch, '$range' from switches where sysname = '$name';\n";
-}
-close HOSTS;
-
-print "end;\n";