summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/drakcluster/server_conf.pm39
1 files changed, 18 insertions, 21 deletions
diff --git a/perl-install/drakcluster/server_conf.pm b/perl-install/drakcluster/server_conf.pm
index c4c90056b..c0c3b559b 100644
--- a/perl-install/drakcluster/server_conf.pm
+++ b/perl-install/drakcluster/server_conf.pm
@@ -32,27 +32,24 @@ sub fields {
my $current_conf = { %$conf };
put_in_hash($conf, $default_conf);
my @l = (
- [ NODENAME => 'node use for administration', check => \&check_non_empty ],
- [ COMPUTENODENAME => 'name use for compute interface', check => \&check_non_empty ],
+ [ NODENAME => 'Node name (Administration network)' , check => \&check_non_empty ],
+ [ COMPUTENODENAME => 'Node Name (Computing network)', check => \&check_non_empty ],
- [ STARTNODE => 'IP start node', check => \&check_number ],
- [ FINISHNODE => 'IP end node', check => sub { &check_number || $conf->{STARTNODE} >= $conf->{FINISHNODE} && N("\"start node\" must be lower than \"end node\"") } ],
+ [ STARTNODE => 'IP of the first node', check => \&check_number ],
+ [ FINISHNODE => 'IP of the last node', check => sub { &check_number || $conf->{STARTNODE} >= $conf->{FINISHNODE} && N("\"The First node\" must have an IP lower than \"the last node\"") } ],
- [ ADMIN_INTERFACE => 'admin interface', list => $network_interfaces ],
- [ EXTERNAL_INTERFACE => 'external interface', list => $network_interfaces ],
- [ COMPUTE_INTERFACE => 'compute interface', list => $network_interfaces ],
- [ NTPSERVER => N("NTP Server IP"), check => sub { &check_ip || check_default(@_, $default_conf->{NTPSERVER}, $current_conf->{NTPSERVER}) } ],
-
- [ DOMAINNAME => N("domain name use for administration of node"), check => sub { check_default(@_, $default_conf->{DOMAINNAME}, $current_conf->{DOMAINNAME}) } ],
- [ NISDOMAINNAME => N("nis domain name use for NIS"), check => \&check_non_empty ],
- [ DOMAINCOMP => N("domain name use for compute"), check => \&check_non_empty ],
- [ IPOFFORWARDER => 'IP of Forwarder resolv ip out of zone ', check => sub { $_[0] && check_ip(@_) } ],
- [ DNSKEY => 'dnskey for the dns server', check => \&check_non_empty ],
- [ ADDSEARCH => 'ADDSEARCH ' . N("is needed if you want your cluster resolv out of zone ip") ],
-
- [ USERADMIN => 'useradmin define wich user admin PBS queue', check => \&check_non_empty ],
-
- [ ORIGIN => 'ORIGIN ' . N("domain that locally-posted mail appears to come from"), check => \&check_non_empty ],
+ [ ADMIN_INTERFACE => 'Administration Network Interface', list => $network_interfaces ],
+ [ EXTERNAL_INTERFACE => 'External Network Interface', list => $network_interfaces ],
+ [ COMPUTE_INTERFACE => 'Computing Network Interface', list => $network_interfaces ],
+ [ NTPSERVER => N("NTP Server IP Address"), check => sub { &check_ip || check_default(@_, $default_conf->{NTPSERVER}, $current_conf->{NTPSERVER}) } ],
+ [ DOMAINNAME => N("Administration node domain name"), check => sub { check_default(@_, $default_conf->{DOMAINNAME}, $current_conf->{DOMAINNAME}) } ],
+ [ NISDOMAINNAME => N("NIS domain name"), check => \&check_non_empty ],
+ [ DOMAINCOMP => N("Computing domain name"), check => \&check_non_empty ],
+ [ IPOFFORWARDER => 'IP address of your external DNS', check => sub { $_[0] && check_ip(@_) } ],
+ [ DNSKEY => 'DNS server dnskey', check => \&check_non_empty ],
+ [ ADDSEARCH => 'ADDSEARCH ' . N("Domain name of your external network") ],
+ [ USERADMIN => 'PBS administrator user name', check => \&check_non_empty ],
+ [ ORIGIN => 'ORIGIN ' . N("Domain that locally posted mails appears to come from"), check => \&check_non_empty ],
);
if (@$network_interfaces <= 2) {
@@ -92,14 +89,14 @@ sub check_number {
}
sub check_ip {
my ($val, $txt) = @_;
- !is_ip($val) && N("Field \"%s\" must be an IP", $txt);
+ !is_ip($val) && N("Field \"%s\" must be a valid IP address", $txt);
}
sub check_default {
my ($val, $txt, $warn, $in, $default_val, $pre_val) = @_;
if ($default_val && $val ne $default_val && $val ne $pre_val) {
if ($warn eq 'warn') {
- return '' if $in->ask_okcancel('', N("You changed the default value of field \"%s\". Are you sure you want to do this?", $txt));
+ return '' if $in->ask_okcancel('', N("You changed the default value of field \"%s\". Are you sure to do this?", $txt));
}
'already_displayed';
} else {