- add a third NTP server server

- fix layout of various wizards
- remove sambaprint wizard (user should now use draksambashare)
- fix ftp default port to 21
- disable kolab and inn wizards (don't know how to use/fix them, help
  welcome)

1 files changed, 7 insertions, 3 deletions

diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm
index 290a7ff9..b63197c1 100644
--- a/time_wizard/Ntp.pm
+++ b/time_wizard/Ntp.pm
@@ -37,7 +37,8 @@ my $o = {
     name => N("Time wizard"),
 	var => { 
 	    varserver1 => '',
-	    varserver2 => '',
+ 	    varserver2 => '',
+ 	    varserver3 => '',
 	    wiz_timezone => ''
 	},
 	needed_rpm => [ 'ntp' ],
@@ -76,14 +77,16 @@ $o->{pages} = {
 	          next => 'config'
 	      },
 	      config => {
-	          name => N("Time servers") . "\n\n" . N("Select a primary and secondary server from the list.") . "\n\n" . N("(we recommend using the server pool.ntp.org twice as this server randomly points to available time servers)"),
+	          name => N("Time servers") . "\n\n" . N("Select a primary a secondary and a third server from the list.") . "\n\n" . N("(we recommend using the server pool.ntp.org twice as this server randomly points to available time servers)"),
                   pre => sub {
 			$o->{var}{varserver1} ||= 'pool.ntp.org';
-			$o->{var}{varserver2} ||= 'pool.ntp.org';
+ 			$o->{var}{varserver2} ||= 'pool.ntp.org';
+ 			$o->{var}{varserver3} ||= 'pool.ntp.org';
 		  },
                   data => [
 		      { label => N("Primary time server:"), val => \$o->{var}{varserver1}, list => [ keys %$ntp_servers ] }, #format => sub { $ntp_servers{$_[0]} } },
 		      { label => N("Secondary time server:"), val => \$o->{var}{varserver2}, list => [ keys %$ntp_servers ] }, # format => sub { $ntp_servers{$_[0]} } },
+		      { label => N("Third time server:"), val => \$o->{var}{varserver3}, list => [ keys %$ntp_servers ] }, # format => sub { $ntp_servers{$_[0]} } },
 		      ],
 	          next => 'choose_region'
 	      },
@@ -121,6 +124,7 @@ $o->{pages} = {
 		  data => [
 		      { label => N("Primary time server:"), val_ref => \$o->{var}{varserver1} },
 		      { label => N("Secondary time server:"), val_ref => \$o->{var}{varserver2} },
+		      { label => N("Third time server:"), val_ref => \$o->{var}{varserver3} },
 		      { label => N("Time zone:"), val_ref => \$o->{var}{wiz_timezone} },
 		      ],
 		      next => 'end'