Merge.

[nms] / make-all-config.sh

diff --git a/make-all-config.sh b/make-all-config.sh
index 10d3180e12c28a6dc3ab3ad049911bc25313ad36..1db0af253c8434f31f10bdbbff59a25cdfe3b4af 100755 (executable)
--- a/make-all-config.sh
+++ b/make-all-config.sh
@@ -1,5 +1,6 @@
 #! /bin/sh
 ./planning/planning
+scp switches.txt patchlist.txt space:/root/
 cat static-switches.txt >> switches.txt
 ./config/make-dhcpd.pl > /etc/dhcp3/dhcpd.conf
 ./config/make-named.pl > /etc/bind/named.conf
@@ -10,4 +11,7 @@ cat static-switches.txt >> switches.txt
 scp mbd-ports *-config sesse@f1:/tftpboot/portcfg/
 
 # regenerate the mbd netlist
-(echo '# Autogenerated. Do not touch!' ; echo "package Config;"; echo 'our @networks = (' ; cut -d" " -f1-2 switches.txt | perl -e 'while (<>) { chomp; my ($net,$mask) = split / /; print "\t\"$net/$mask\",\n"; }' ; echo ');' ; echo '1;')  > mbd/nets.pl 
+(echo '# Autogenerated. Do not touch!' ; echo "package Config;"; echo 'our @networks = (' ; cut -d" " -f1-2 switches.txt | grep -vE '87\.76\.(130|131|216)\.0' | perl -e 'while (<>) { chomp; my ($net,$mask) = split / /; print "\t\"$net/$mask\",\n"; }' ; echo ');' ; echo '1;')  > mbd/nets.pl 
+
+perl web/make-switches.pl > switches.sql
+scp switches.sql root@space: