Skip to content

Commit a734890

Browse files
authored
some documentation fixes (netdisco#640)
* a few more files to ignore * the pgtune we reference seems to be dead, provide a few alternatives. * steal pod syntax check from snmp::info, but don't bother with checking Test::Pod version. we want 1.22 or later, which was released in 2005 * reference the release notes in our wiki. changes you need to make manually during upgrades are documented there. * add pod test to manifest * term was defined around line 111 and then again at line 209, rename the second one
1 parent 9730b87 commit a734890

File tree

6 files changed

+59
-20
lines changed

6 files changed

+59
-20
lines changed

MANIFEST

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ share/views/sidebar/search/device.tt
508508
share/views/sidebar/search/node.tt
509509
share/views/sidebar/search/port.tt
510510
xt/00-compile.t
511+
xt/01-local-pod.t
511512
xt/10-sort_port.t
512513
xt/11-portsort.t
513514
xt/20-checkacl.t

META.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Oliver Gorwits <[email protected]>"
55
],
66
"dynamic_config" : 1,
7-
"generated_by" : "Module::Build version 0.4224",
7+
"generated_by" : "Module::Build version 0.4229",
88
"license" : [
99
"bsd"
1010
],
@@ -39,6 +39,7 @@
3939
"App::cpanminus" : "1.6108",
4040
"App::local::lib::helper" : "0.07",
4141
"Archive::Extract" : "0",
42+
"Authen::Radius" : "0",
4243
"CGI::Expand" : "2.05",
4344
"DBD::Pg" : "0",
4445
"DBIx::Class" : "0.082841",
@@ -143,7 +144,7 @@
143144
},
144145
"App::Netdisco::DB" : {
145146
"file" : "lib/App/Netdisco/DB.pm",
146-
"version" : "58"
147+
"version" : "59"
147148
},
148149
"App::Netdisco::DB::ExplicitLocking" : {
149150
"file" : "lib/App/Netdisco/DB/ExplicitLocking.pm"
@@ -268,6 +269,9 @@
268269
"App::Netdisco::DB::Result::Virtual::GenericReport" : {
269270
"file" : "lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm"
270271
},
272+
"App::Netdisco::DB::Result::Virtual::LastNode" : {
273+
"file" : "lib/App/Netdisco/DB/Result/Virtual/LastNode.pm"
274+
},
271275
"App::Netdisco::DB::Result::Virtual::NodeIp4" : {
272276
"file" : "lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm"
273277
},
@@ -804,7 +808,7 @@
804808
},
805809
"homepage" : "http://netdisco.org/",
806810
"license" : [
807-
"http://opensource.org/licenses/BSD-3-Clause"
811+
"http://opensource.org/licenses/bsd-license.php"
808812
],
809813
"repository" : {
810814
"url" : "https://github.com/netdisco/netdisco"
@@ -813,5 +817,5 @@
813817
"x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
814818
},
815819
"version" : "2.042010",
816-
"x_serialization_backend" : "JSON::PP version 2.97001"
820+
"x_serialization_backend" : "JSON::PP version 4.02"
817821
}

META.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ configure_requires:
1414
DBIx::Class: '0.082810'
1515
Module::Build: '0.42'
1616
dynamic_config: 1
17-
generated_by: 'Module::Build version 0.4224, CPAN::Meta::Converter version 2.150010'
17+
generated_by: 'Module::Build version 0.4229, CPAN::Meta::Converter version 2.150010'
1818
license: bsd
1919
meta-spec:
2020
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -38,7 +38,7 @@ provides:
3838
file: lib/App/Netdisco/Configuration.pm
3939
App::Netdisco::DB:
4040
file: lib/App/Netdisco/DB.pm
41-
version: '58'
41+
version: '59'
4242
App::Netdisco::DB::ExplicitLocking:
4343
file: lib/App/Netdisco/DB/ExplicitLocking.pm
4444
App::Netdisco::DB::Result::Admin:
@@ -121,6 +121,8 @@ provides:
121121
file: lib/App/Netdisco/DB/Result/Virtual/DuplexMismatch.pm
122122
App::Netdisco::DB::Result::Virtual::GenericReport:
123123
file: lib/App/Netdisco/DB/Result/Virtual/GenericReport.pm
124+
App::Netdisco::DB::Result::Virtual::LastNode:
125+
file: lib/App/Netdisco/DB/Result/Virtual/LastNode.pm
124126
App::Netdisco::DB::Result::Virtual::NodeIp4:
125127
file: lib/App/Netdisco/DB/Result/Virtual/NodeIp4.pm
126128
App::Netdisco::DB::Result::Virtual::NodeIp6:
@@ -483,6 +485,7 @@ requires:
483485
App::cpanminus: '1.6108'
484486
App::local::lib::helper: '0.07'
485487
Archive::Extract: '0'
488+
Authen::Radius: '0'
486489
CGI::Expand: '2.05'
487490
DBD::Pg: '0'
488491
DBIx::Class: '0.082841'
@@ -556,7 +559,7 @@ resources:
556559
MailingList: https://lists.sourceforge.net/lists/listinfo/netdisco-users
557560
bugtracker: https://github.com/netdisco/netdisco/issues
558561
homepage: http://netdisco.org/
559-
license: http://opensource.org/licenses/BSD-3-Clause
562+
license: http://opensource.org/licenses/bsd-license.php
560563
repository: https://github.com/netdisco/netdisco
561564
version: '2.042010'
562565
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

bin/netdisco-deploy

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ these is an optional service which the user is asked to confirm.
7171
Pre-existing requirements are that there be a database table created and a
7272
user with rights to create tables in that database. Both the table and user
7373
name must match those configured in your environment YAML file (default
74-
C<~/environments/deployment.yml>).
74+
F<~/environments/deployment.yml>).
7575
7676
This script will download the latest MAC address vendor prefix data from the
7777
Internet, and update the OUI table in the database. Hence Internet access is
@@ -80,10 +80,17 @@ required to run the script.
8080
Similarly the latest Netdisco MIB bundle is also downloaded and placed into
8181
the user's home directory (or C<$ENV{NETDISCO_HOME}>).
8282
83+
If you upgrade Netdisco make sure you run this script again to make sure
84+
your config remains compatible.
85+
86+
Before each upgrade also review the
87+
L<Release notes|https://github.com/netdisco/netdisco/wiki/Release-Notes> since
88+
additional steps might be required!
89+
8390
=cut
8491

8592
print color 'bold cyan';
86-
say 'This is the Netdisco II deployment script.';
93+
say 'This is the Netdisco 2 deployment script.';
8794
say '';
8895
say 'Before we continue, the following prerequisites must be in place:';
8996
say ' * Database added to PostgreSQL for Netdisco';
@@ -92,6 +99,11 @@ say ' * "~/environments/deployment.yml" file configured with Database dsn/user/p
9299
say ' * A full backup of any existing Netdisco database data';
93100
say ' * Internet access (for OUIs and MIBs)';
94101
say '';
102+
say 'If you are upgrading Netdisco 2 read the release notes:';
103+
say 'https://github.com/netdisco/netdisco/wiki/Release-Notes';
104+
say 'There you will find required and incompatible changes';
105+
say 'which are not covered by this script.';
106+
say '';
95107
say 'You will be asked to confirm all changes to your system.';
96108
say '';
97109
print color 'reset';
@@ -194,13 +206,13 @@ sub deploy_db {
194206
}
195207

196208
sub get_userpass {
197-
my $term = shift;
198-
my $name = $term->get_reply(prompt => 'Username: ');
199-
my $pass = $term->get_reply(prompt => 'Password: ');
209+
my $upterm = shift;
210+
my $name = $upterm->get_reply(prompt => 'Username: ');
211+
my $pass = $upterm->get_reply(prompt => 'Password: ');
200212

201213
unless ($name and $pass) {
202214
say 'username and password cannot be empty, please try again.';
203-
($name, $pass) = get_userpass($term);
215+
($name, $pass) = get_userpass($upterm);
204216
}
205217

206218
return ($name, $pass);
@@ -257,7 +269,7 @@ sub deploy_oui {
257269
print color 'reset';
258270
}
259271

260-
# This subroutine is baed on Wireshark's make-manuf
272+
# This subroutine is based on Wireshark's make-manuf
261273
# http://anonsvn.wireshark.org/wireshark/trunk/tools/make-manuf
262274
sub shorten {
263275
my $manuf = shift;

lib/App/Netdisco.pm

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,25 @@ application:
116116
You may wish to L<amend the PostgreSQL
117117
configuration|https://github.com/netdisco/netdisco/wiki/Install-Tips#enable-md5-authentication-to-postgresql>
118118
so that local connections are working. The default PostgreSQL configuration
119-
also needs tuning for modern server hardware. We recommend that you use the
120-
C<pgtune> Python program to auto-tune your C<postgresql.conf> file:
119+
can also use tuning for modern server hardware. We recommend that you use one of the following
120+
tools to tune your C<postgresql.conf> file:
121121
122122
=over 4
123123
124-
=item *
124+
=item L<postgresqltuner|https://github.com/jfcoz/postgresqltuner>
125+
126+
Script that will check your operating system resources and settings as well as your
127+
running PostgreSQL database and will make recommendations based on actual load. Works
128+
on new netdisco installs but will make the best suggestions once the database contains
129+
a bigger dataset.
130+
131+
=item L<pgtune (fork)|https://pgtune.leopard.in.ua>
132+
133+
A web based application which will recommend which parameters to change.
134+
135+
=item L<pgtune|https://github.com/elitwin/pgtune>
125136
126-
L<https://github.com/elitwin/pgtune>
137+
Program to auto-tune your C<postgresql.conf>, regretfully not updated in a while.
127138
128139
=back
129140
@@ -230,7 +241,7 @@ If you're running a version of Netdisco prior to 2.x then you should follow
230241
the full installation instructions, above. This process is for upgrading
231242
version 2.x only.
232243
233-
Before upgrading please review the latest L<Release Notes|https://github.com/netdisco/netdisco/wiki/Release-Notes>.
244+
Before upgrading always review the latest L<Release Notes|https://github.com/netdisco/netdisco/wiki/Release-Notes>.
234245
Then the process below should be run for each installation:
235246
236247
# upgrade Netdisco
@@ -333,7 +344,7 @@ built upon.
333344
334345
=head1 COPYRIGHT AND LICENSE
335346
336-
This software is copyright (c) 2011-2018 by The Netdisco Developer Team.
347+
This software is copyright (c) 2011-2019 by The Netdisco Developer Team.
337348
338349
Redistribution and use in source and binary forms, with or without
339350
modification, are permitted provided that the following conditions are met:

xt/01-local-pod.t

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env perl
2+
3+
use strict;
4+
use warnings;
5+
use Test::More;
6+
use Test::Pod;
7+
8+
all_pod_files_ok();

0 commit comments

Comments
 (0)