TG15 Spring cleanup.

1 files changed, 25 insertions, 27 deletions

diff --git a/include/config.pm.dist b/include/config.pm.dist
index cefb5a0..fdf68a1 100755
--- a/include/config.pm.dist
+++ b/include/config.pm.dist
@@ -4,62 +4,60 @@ use warnings;
 use DBI;
 package nms::config;
 
+# DB
 our $db_name = "nms";
 our $db_host = "frank.tg14.gathering.org";
 our $db_username = "nms";
 our $db_password = "<removed>";
 
-our $dhcp_server1 = "151.216.254.2";
-our $dhcp_server2 = "151.216.253.19"; # Cisco ISE profiling
+# DHCP-servers
+our $dhcp_server1 = "151.216.254.2"; # primary
+our $dhcp_server2 = "151.216.253.19"; # secondary
 
-our $ios_user = "dlinkng"; # used by dlink-ng +++
-our $ios_pass = "<removed>";
+# TACACS-login for NMS
+our $tacacs_user = "nms";
+our $tacacs_pass = "<removed>";
 
-# Tech:Net sets up at least a read-community for SNMP for use
-# with dlink1g, nms and sosuch. This is the one:
+# SNMP read-only for NMS, etc
 our $snmp_community = "<removed>";
 
-our $dlink1g_user = 'dlinkng'; # used by nms.pm to connect to D-Link-switches
-our $dlink1g_passwd = '<removed>';
-
 # Telnet-timeout for smanagrun
 our $telnet_timeout = 30;
 
-# No longer in use as of '12 ?
-# our $telegw_ip = "12.34.56.78";
-# our @telegw_wanlinks = ("gig1/1", "gig1/2");
-
+# IP/IPv6/DNS-info
 our $tgname    = "tg14";
-
 our $pri_hostname     = "brad";
 our $pri_v4   = "151.216.254.2";
 our $pri_v6    = "2a02:ed02:254::2";
-our $pri_net   = "151.216.254.0/24";
+our $pri_net   = "151.216.254.0/24"; # network that primary server is in
+
 our $sec_hostname     = "janet";
 our $sec_v4   = "151.216.253.2";
 our $sec_v6    = "2a02:ed02:253::2";
+our $sec_net   = "151.216.253.0/24"; # network that secondary server is in
 
 # for RIPE to get reverse zones via DNS AXFR
-our $ext_xfer  = "193.0.0.0/22";
-our $ext_ns    = "194.19.3.20";
+# https://www.ripe.net/data-tools/dns/reverse-dns/how-to-set-up-reverse-delegation
+our $ext_xfer  = "193.0.0.0/22; 2001:610:240::/48; 2001:67c:2e8::/48";
+
+# allow XFR from NOC
+our $noc_nett  = "151.216.252.0/24; 2a02:ed02:252::/64";
 
 # To generate new dnssec-key for ddns:
 # dnssec-keygen -a HMAC-MD5 -b 128 -n HOST DHCP_UPDATER
 our $ddns_key = "<removed>";
 our $ddns_to  = "127.0.0.1";
 
-# Used by make-named.pl
-our $noc_nett  = "151.216.252.0/24";
-our $noc_nett_v6 = "2a02:ed02:252::/64";
-
-our $base_ipv4net = "151.216.128.0";
-our $base_ipv4prefix = 17;
-
-our $base_ipv6net = "2a02:ed02:";
-our $base_ipv6prefix = 32;
+# Base networks
+our $base_ipv4net = "151.216.128.0/17";
+our $base_ipv6net = "2a02:ed02::/32";
 our $ipv6zone = "2.0.d.e.2.0.a.2.ip6.arpa";
 
-our $ciscowlc_a = "151.216.253.21";
+# extra networks that are outside the normal ranges
+our $extra_net = "185.12.59.0/24";
+
+# add WLC's
+our $wlc1 = "151.216.253.21";
 
 # Change from tg14: PXE-server is set to Secondary/SMTP/TFTP box,
 # and the toolchain assumes this fact. Variable kept for clarity: