From bfbd8238b2d6dad88178d9684f3af568d5182bce Mon Sep 17 00:00:00 2001 From: Gaurav Date: Tue, 21 Feb 2012 16:29:40 -0800 Subject: Bug 4086:fixed order of display in show dns forwarding nameservers, removed redundant information --- scripts/vyatta-op-dns-forwarding.pl | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index dc5fbf1..5f94c15 100755 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -188,6 +188,9 @@ sub get_dns_nameservers { $show_nameservers_output .= "-----------------------------------------------\n"; $show_nameservers_output .= " Nameservers configured for DNS forwarding\n"; $show_nameservers_output .= "-----------------------------------------------\n"; + my $show_nameservers_output_dhcp; + my $show_nameservers_output_domain; + my $show_nameservers_output_nameserver; my $line_flag; ## server=/test.com/1.1.1.1 @@ -204,9 +207,9 @@ sub get_dns_nameservers { @domain_tokens = split(/\//, $nameserver); if (!defined($line_flag)) { $line_flag = 1; - $show_nameservers_output .= "\n"; - $show_nameservers_output .= "Domain Overrides\n"; - $show_nameservers_output .= "\n"; + $show_nameservers_output_domain .= "\n"; + $show_nameservers_output_domain .= "Domain Overrides:\n"; + $show_nameservers_output_domain .= "\n"; } } $active_nameservers[$active_nameserver_count] = $nameserver; @@ -214,13 +217,22 @@ sub get_dns_nameservers { my $nameserver_via = $nameserver_array[2]; if (@nameserver_array > 3){ my $dhcp_interface = $nameserver_array[3]; - $show_nameservers_output .= "$nameserver available via '$nameserver_via $dhcp_interface'\n"; + $show_nameservers_output_dhcp .= "$nameserver available via '$nameserver_via $dhcp_interface'\n"; } elsif (@domain_tokens) { - $show_nameservers_output .= "$domain_tokens[1] uses $domain_tokens[2] via '$nameserver_via'\n"; + $show_nameservers_output_domain .= "$domain_tokens[1] uses $domain_tokens[2]\n"; } else { - $show_nameservers_output .= "$nameserver available via '$nameserver_via'\n"; + $show_nameservers_output_nameserver .= "$nameserver available via '$nameserver_via'\n"; } } + if (defined ($show_nameservers_output_nameserver)) { + $show_nameservers_output .= $show_nameservers_output_nameserver; + } + if (defined ($show_nameservers_output_dhcp)) { + $show_nameservers_output .= $show_nameservers_output_dhcp; + } + if (defined ($show_nameservers_output_domain)) { + $show_nameservers_output .= $show_nameservers_output_domain ; + } # then you need to get nameservers from /etc/resolv.conf that are not in dnsmasq.conf to show them as inactive -- cgit v1.2.3 From 9552e97e6a0248bf3d9216dd4b84ad9736cd9833 Mon Sep 17 00:00:00 2001 From: Gaurav Date: Tue, 21 Feb 2012 16:31:54 -0800 Subject: 0.13.234 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1421630..5350e0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-op (0.13.234) unstable; urgency=low + + * Bug 4086:fixed order of display in show dns forwarding nameservers, + removed redundant information + + -- Gaurav Tue, 21 Feb 2012 16:31:54 -0800 + vyatta-op (0.13.233) unstable; urgency=low * Add bridge info to show tech support -- cgit v1.2.3 From d1071c1207973ee37bbdbc90047f2a7b63ebb4ef Mon Sep 17 00:00:00 2001 From: John Southworth Date: Wed, 22 Feb 2012 08:49:05 -0800 Subject: Bugfix 2581: show protocol debugging summary with 'show monitoring' --- templates/show/monitoring/node.def | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/show/monitoring/node.def b/templates/show/monitoring/node.def index 9c16edc..2e38feb 100644 --- a/templates/show/monitoring/node.def +++ b/templates/show/monitoring/node.def @@ -1,2 +1,7 @@ help: Show currently monitored services -run: ${vyatta_bindir}/vyatta-monitor-list +run: echo "Background monitoring sessions:" + ${vyatta_bindir}/vyatta-monitor-list + for proto in bgp ospf rip ospfv3 ripng; do + show monitoring protocols $proto + done + -- cgit v1.2.3 From 6556eaf70db21e790aef323c32523fe0c439ec0b Mon Sep 17 00:00:00 2001 From: John Southworth Date: Wed, 22 Feb 2012 08:55:27 -0800 Subject: Bugfix 5806: Don't show ntp.vyatta.com by default for show ntp --- templates/show/ntp/node.tag/node.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/show/ntp/node.tag/node.def b/templates/show/ntp/node.tag/node.def index 8eb5406..e7bdb6a 100644 --- a/templates/show/ntp/node.tag/node.def +++ b/templates/show/ntp/node.tag/node.def @@ -1,3 +1,3 @@ help: Show date and time of specified NTP server -allowed: echo -e 'ntp.vyatta.com'; awk '/^server/ { print $2 }' /etc/ntp.conf -run: /usr/sbin/ntpdate -q ${3:-ntp.vyatta.com} +allowed: awk '/^server/ { print $2 }' /etc/ntp.conf +run: /usr/sbin/ntpdate -q $3 -- cgit v1.2.3 From c4ede891598898c6595e17f5ceda29ad0e7fcffb Mon Sep 17 00:00:00 2001 From: John Southworth Date: Wed, 22 Feb 2012 08:55:39 -0800 Subject: 0.13.235 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5350e0a..7541ca6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-op (0.13.235) unstable; urgency=low + + * Bugfix 2581: show protocol debugging summary with 'show monitoring' + * Bugfix 5806: Don't show ntp.vyatta.com by default for show ntp + + -- John Southworth Wed, 22 Feb 2012 08:55:39 -0800 + vyatta-op (0.13.234) unstable; urgency=low * Bug 4086:fixed order of display in show dns forwarding nameservers, -- cgit v1.2.3 From 271020f565dcc7f5506b63a61222374fe44e9dde Mon Sep 17 00:00:00 2001 From: John Southworth Date: Wed, 22 Feb 2012 10:11:24 -0800 Subject: Add headers to show montioring command --- templates/show/monitoring/node.def | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/templates/show/monitoring/node.def b/templates/show/monitoring/node.def index 2e38feb..2c6587a 100644 --- a/templates/show/monitoring/node.def +++ b/templates/show/monitoring/node.def @@ -1,7 +1,12 @@ help: Show currently monitored services -run: echo "Background monitoring sessions:" +run: echo "------------------------------" + echo "Background monitoring sessions" + echo "------------------------------" ${vyatta_bindir}/vyatta-monitor-list + echo + echo "------------------------------" + echo " Protocol monitoring status" + echo "------------------------------" for proto in bgp ospf rip ospfv3 ripng; do show monitoring protocols $proto done - -- cgit v1.2.3 From ad3177fc2fa442a55c6ac50b968c9dfbf060f481 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Wed, 22 Feb 2012 10:11:37 -0800 Subject: 0.13.236 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7541ca6..123efdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-op (0.13.236) unstable; urgency=low + + * Add headers to show montioring command + + -- John Southworth Wed, 22 Feb 2012 10:11:37 -0800 + vyatta-op (0.13.235) unstable; urgency=low * Bugfix 2581: show protocol debugging summary with 'show monitoring' -- cgit v1.2.3