From 9f8e1eed8d695c2980b05d9310a34db19edba69f Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Sun, 27 Mar 2016 12:00:45 +0200 Subject: TG16 config.dist --- include/config.pm.dist | 58 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 27 deletions(-) (limited to 'include') diff --git a/include/config.pm.dist b/include/config.pm.dist index a1db01a..d04913c 100755 --- a/include/config.pm.dist +++ b/include/config.pm.dist @@ -6,7 +6,7 @@ package nms::config; # DB our $db_name = "nms"; -our $db_host = "gerald.tg15.gathering.org"; +our $db_host = "185.110.148.10"; our $db_username = "nms"; our $db_password = ""; @@ -32,45 +32,46 @@ our @snmp_objects = [ ['ifOutErrors'], ['ifInUnknownProtos'], ['ifOutQLen'], -['1.3.6.1.4.1.2636.3.1.13.1.7.7.1.0'] +['sysUpTime'], +['jnxOperatingTemp'], +['jnxOperatingCPU'], +['jnxOperatingDescr'], +['jnxBoxSerialNo'] ]; # Max SNMP polls to fire off at the same time. our $snmp_max = 20; # DHCP-servers -our $dhcp_server1 = "185.12.59.66"; # primary -our $dhcp_server2 = "185.12.59.2"; # secondary +our $dhcp_server1 = "185.110.149.2"; # primary +our $dhcp_server2 = "185.110.148.2"; # secondary # TACACS-login for NMS our $tacacs_user = ""; our $tacacs_pass = ""; -# SNMP read-only for NMS, etc -our $snmp_community = ""; - # Telnet-timeout for smanagrun our $telnet_timeout = 300; # IP/IPv6/DNS-info -our $tgname = "tg15"; -our $pri_hostname = "marty"; -our $pri_v4 = "185.12.59.66"; -our $pri_v6 = "2a02:ed02:1ee7::66"; -our $pri_net_v4 = "185.12.59.64/27"; -our $pri_net_v6 = "2a02:ed02:1ee7::/64"; - -our $sec_hostname = "emmet"; -our $sec_v4 = "185.12.59.2"; -our $sec_v6 = "2a02:ed02:1337::2"; -our $sec_net_v4 = "185.12.59.0/26"; -our $sec_net_v6 = "2a02:ed02:1337::/64"; +our $tgname = "tg16"; +our $pri_hostname = "r2-d2"; +our $pri_v4 = "185.110.149.2"; +our $pri_v6 = "2a06:5841:149a::2"; +our $pri_net_v4 = "185.110.149.0/26"; +our $pri_net_v6 = "2a06:5841:149a::/64"; + +our $sec_hostname = "c-3po"; +our $sec_v4 = "185.110.148.2"; +our $sec_v6 = "2a06:5841:1337::2"; +our $sec_net_v4 = "185.110.148.0/26"; +our $sec_net_v6 = "2a06:5841:1337::/64"; # for RIPE to get reverse zones via DNS AXFR # 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_net = "151.216.254.0/24; 2a02:ed02:254::/64"; +our $noc_net = "185.110.150.0/25; 2a06:5841:150a::1/64"; # To generate new dnssec-key for ddns: # dnssec-keygen -a HMAC-MD5 -b 128 -n HOST DHCP_UPDATER @@ -78,25 +79,28 @@ our $ddns_key = ""; our $ddns_to = "127.0.0.1"; # just use localhost # 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 $base_ipv4net = "88.92.0.0/17"; +our $base_ipv6net = "2a06:5840::/29"; +our $ipv6zone = "0.4.8.5.6.0.a.2.ip6.arpa"; # extra networks that are outside the normal ranges # that should have recursive DNS access -our $rec_net = "185.12.59.0/24"; +our $rec_net = "185.110.148.0/22"; # extra networks that are outside the normal ranges # that should be added to DNS our @extra_nets = ( - '185.12.59.0/24', # norsk nett + '185.110.148.0/24', + '185.110.149.0/24', + '185.110.150.0/24', + '185.110.151.0/24', ); # add WLC's -our $wlc1 = "151.216.128.130"; +our $wlc1 = "185.110.148.14"; # add VOIP-server -our $voip1 = ""; +our $voip1 = "134.90.150.162"; # PXE-server (rest of bootstrap assumes $sec_v4/$sec_v6) our $pxe_server_v4 = $sec_v4; -- cgit v1.2.3 From 69722b70c1f07fd728388e8dcd2c3440ca4468be Mon Sep 17 00:00:00 2001 From: Joachim Tingvold Date: Tue, 29 Mar 2016 23:39:40 +0200 Subject: Changes for TG16. --- include/config.pm.dist | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/config.pm.dist b/include/config.pm.dist index d04913c..776e479 100755 --- a/include/config.pm.dist +++ b/include/config.pm.dist @@ -6,7 +6,7 @@ package nms::config; # DB our $db_name = "nms"; -our $db_host = "185.110.148.10"; +our $db_host = "bb-8.tg16.gathering.org"; our $db_username = "nms"; our $db_password = ""; @@ -90,17 +90,17 @@ our $rec_net = "185.110.148.0/22"; # extra networks that are outside the normal ranges # that should be added to DNS our @extra_nets = ( - '185.110.148.0/24', - '185.110.149.0/24', - '185.110.150.0/24', - '185.110.151.0/24', + '185.110.148.0/24', + '185.110.149.0/24', + '185.110.150.0/24', + '185.110.151.0/24', ); # add WLC's our $wlc1 = "185.110.148.14"; # add VOIP-server -our $voip1 = "134.90.150.162"; +our $voip1 = ""; # PXE-server (rest of bootstrap assumes $sec_v4/$sec_v6) our $pxe_server_v4 = $sec_v4; -- cgit v1.2.3 From 51e9872f4ac5db633c12862dec951e0b91b1b132 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Thu, 31 Mar 2016 20:44:38 +0200 Subject: NMS: Fix historic review, part one The actual replay might still be bugged, but fixed-point review works. --- include/nms/web.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/nms/web.pm b/include/nms/web.pm index 889e774..7c9339e 100755 --- a/include/nms/web.pm +++ b/include/nms/web.pm @@ -15,7 +15,7 @@ package nms::web; use base 'Exporter'; our %get_params; our %json; -our @EXPORT = qw(finalize_output json $dbh db_safe_quote %get_params get_input %json); +our @EXPORT = qw(finalize_output now json $dbh db_safe_quote %get_params get_input %json); our $dbh; our $now; our $when; @@ -66,7 +66,7 @@ sub setwhen { $offset = $_[1]; } if (defined($get_params{'now'})) { - $now = db_safe_quote('now') . "::timestamp "; + $now = db_safe_quote('now') . "::timestamp with time zone "; $cc{'max-age'} = "3600"; } $now = "(" . $now . " - '" . $offset . "'::interval)"; @@ -77,10 +77,10 @@ sub finalize_output { my $query; my $hash = Digest::SHA::sha512_base64(FreezeThaw::freeze(%json)); $dbh->commit; - $query = $dbh->prepare('select to_char(' . $now . ', \'YYYY-MM-DD"T"HH24:MI:SS\') as time;'); + $query = $dbh->prepare('select extract(epoch from date_trunc(\'seconds\', ' . $now . ')) as time;'); $query->execute(); - $json{'time'} = $query->fetchrow_hashref()->{'time'}; + $json{'time'} = int($query->fetchrow_hashref()->{'time'}); $json{'hash'} = $hash; printcc; -- cgit v1.2.3