T1344: rename RADIUS 'system login' nodes

In order to prepare for adding a RADIUS source IP address and
synchronize the syntax with L2TP/PPTP the nodes have been renamed from:

  set system login radius-server x.x.x.x

to

  set system login radius server x.x.x.x

10 files changed, 8 insertions, 10 deletions

diff --git a/Makefile.am b/Makefile.am
index 70a6bb28..4ecc9dee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,7 @@ src_valid_address = src/valid_address.c
 src_local_ip = src/local_ip.c
 
 share_perl5_DATA = lib/Vyatta/Login/User.pm
-share_perl5_DATA += lib/Vyatta/Login/RadiusServer.pm
+share_perl5_DATA += lib/Vyatta/Login/Radius.pm
 
 sysconf_DATA += sysconf/LICENSE
 sysconf_DATA += sysconf/issue
@@ -108,7 +108,7 @@ rsyslogdir = /etc/rsyslog.d
 #rsyslog_DATA = sysconf/vyatta-log.conf
 
 curver_DATA = cfg-version/vrrp@2
-curver_DATA += cfg-version/system@10
+curver_DATA += cfg-version/system@11
 curver_DATA += cfg-version/broadcast-relay@1
 curver_DATA += cfg-version/mdns@1
 curver_DATA += cfg-version/dhcp-server@5
diff --git a/cfg-version/system@10 b/cfg-version/system@11
index e69de29b..e69de29b 100644
--- a/cfg-version/system@10
+++ b/cfg-version/system@11
diff --git a/lib/Vyatta/Login/RadiusServer.pm b/lib/Vyatta/Login/Radius.pm
index 5a71b1f8..9c2d56aa 100644
--- a/lib/Vyatta/Login/RadiusServer.pm
+++ b/lib/Vyatta/Login/Radius.pm
@@ -14,7 +14,7 @@
 #
 # **** End License ****
 
-package Vyatta::Login::RadiusServer;
+package Vyatta::Login::Radius;
 use strict;
 use warnings;
 use lib "/opt/vyatta/share/perl5";
@@ -63,7 +63,7 @@ sub add_pam_radius {
 
 sub update {
     my $rconfig = new Vyatta::Config;
-    $rconfig->setLevel("system login radius-server");
+    $rconfig->setLevel("system login radius server");
     my %servers = $rconfig->listNodeStatus();
     my $count   = 0;
 
diff --git a/lib/Vyatta/Login/User.pm b/lib/Vyatta/Login/User.pm
index c8b53e0a..c8b53e0a 100755..100644
--- a/lib/Vyatta/Login/User.pm
+++ b/lib/Vyatta/Login/User.pm
diff --git a/scripts/system/vyatta_update_login.pl b/scripts/system/vyatta_update_login.pl
index c41bb9df..41172c55 100755
--- a/scripts/system/vyatta_update_login.pl
+++ b/scripts/system/vyatta_update_login.pl
@@ -31,11 +31,8 @@ while ( my ($type, $status) = each %loginNodes) {
     next if ($status eq 'static');
     next if ($type eq 'banner');
 
-    # convert radius-server to RadiusServer
-    my $kind = ucfirst $type;
-    $kind =~ s/-server/Server/;
-
     # Dynamically load the module to handle that login method
+    my $kind = ucfirst $type;
     require "Vyatta/Login/$kind.pm";
 
     # Dynamically invoke update for this type
diff --git a/templates/system/login/radius/node.def b/templates/system/login/radius/node.def
new file mode 100644
index 00000000..86baaabe
--- /dev/null
+++ b/templates/system/login/radius/node.def
@@ -0,0 +1 @@
+help: RADIUS specific configuration
diff --git a/templates/system/login/radius-server/node.def b/templates/system/login/radius/server/node.def
index efc917ef..efc917ef 100644
--- a/templates/system/login/radius-server/node.def
+++ b/templates/system/login/radius/server/node.def
diff --git a/templates/system/login/radius-server/node.tag/port/node.def b/templates/system/login/radius/server/node.tag/port/node.def
index 06ff7f02..d3869f55 100644
--- a/templates/system/login/radius-server/node.tag/port/node.def
+++ b/templates/system/login/radius/server/node.tag/port/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Radius port [REQUIRED]
+help: Radius port [default: 1812]
 default: 1812
 
 val_help: u32:1-65535; Numeric IP port
diff --git a/templates/system/login/radius-server/node.tag/secret/node.def b/templates/system/login/radius/server/node.tag/secret/node.def
index 90420518..90420518 100644
--- a/templates/system/login/radius-server/node.tag/secret/node.def
+++ b/templates/system/login/radius/server/node.tag/secret/node.def
diff --git a/templates/system/login/radius-server/node.tag/timeout/node.def b/templates/system/login/radius/server/node.tag/timeout/node.def
index 34fcbdb0..a4637981 100644
--- a/templates/system/login/radius-server/node.tag/timeout/node.def
+++ b/templates/system/login/radius/server/node.tag/timeout/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Timeout for radius session [REQUIRED]
+help: Timeout for radius session in seconds [default: 2]
 default: 2
 syntax:expression: $VAR(@) > 0 && $VAR(@) <= 30 \
 		   ; "Timeout must be between 1 and 30 seconds"