diff options
| -rwxr-xr-x | dhcp_wizard/Dhcp.pm | 6 | ||||
| -rwxr-xr-x | drakwizard.pl | 6 | ||||
| -rw-r--r-- | drakwizard.spec | 12 | ||||
| -rwxr-xr-x | ftp_wizard/Proftpd.pm | 4 | ||||
| -rw-r--r-- | nisautofs_wizard/Nisautofs.pm | 27 | ||||
| -rwxr-xr-x | samba_wizard/Samba.pm | 6 | ||||
| -rwxr-xr-x | samba_wizard/Sambashare.pm | 63 | ||||
| -rw-r--r-- | time_wizard/Ntp.pm | 10 |
8 files changed, 83 insertions, 51 deletions
diff --git a/dhcp_wizard/Dhcp.pm b/dhcp_wizard/Dhcp.pm index 34688f80..bf2a322b 100755 --- a/dhcp_wizard/Dhcp.pm +++ b/dhcp_wizard/Dhcp.pm @@ -66,10 +66,11 @@ $o->{pages} = { data => [ { list => [ keys %{$wiz->{net}{itf}} ], val => \$o->{var}{interface} }, ], - next => 'ip_range', no_back => 1, + next => 'ip_range', + no_back => 1, }, ip_range => { - name => N("Range of addresses used by DHCP") . "\n\n\n" . N("Select the range of addresses assigned to the workstations by the DHCP service; unless you have special needs, you can safely accept the proposed values. (ie: 192.168.100.20 192.168.100.40)") . "\n\n" . N("If you want to enable PXE in your dhcp server please check the box (Pre-boot eXecution Environment, a protocol that allows computers to boot through the network)."), + name => N("Range of addresses used by DHCP") . "\n" . N("Select the range of addresses assigned to the workstations by the DHCP service; unless you have special needs, you can safely accept the proposed values. (ie: 192.168.100.20 192.168.100.40)") . "\n\n" . N("If you want to enable PXE in your dhcp server please check the box (Pre-boot eXecution Environment, a protocol that allows computers to boot through the network)."), pre => sub { #($wiz_ip_server) = `/sbin/ip addr show dev $o->{var}{interface}` =~ /^\s*inet\s+(\d+\.\d+\.\d+\.\d+)/m; ($wiz_ip_server) = $wiz->{net}->{itf}{$o->{var}{interface}}{IPADDR}; @@ -86,6 +87,7 @@ $o->{pages} = { { label => N("Enable PXE:"), type => 'bool', val => \$o->{var}{pxe} }, ], next => 'summary', + no_back => 1, }, dhcp_warning => { name => N("Warning") . "\n\n" . N("You are in dhcp, server may not work with your configuration."), diff --git a/drakwizard.pl b/drakwizard.pl index 6689560b..e3b7410f 100755 --- a/drakwizard.pl +++ b/drakwizard.pl @@ -42,7 +42,7 @@ my %all_wizards = ( apache2 => [ 'Apache', N("Apache2 web server"), { ver => 2 } ], samba => [ 'Samba', N("Samba server") ], sambashare => [ 'Sambashare', N("Manage Samba share") ], - sambaprint => [ 'Sambaprint', N("Manage Samba print") ], +# sambaprint => [ 'Sambaprint', N("Manage Samba print") ], # user should use draksambashare postfix => [ 'Postfix', N("Mail server") ], if_(member('proxy_wizard', all($::Wiz_dir)), nisautofs => [ 'Nisautofs', N("NIS server autofs map") ], @@ -53,9 +53,9 @@ my %all_wizards = ( ntp => [ 'Ntp', N("Time server") ], dhcp => [ 'Dhcp', N("DHCP server") ], bind => [ 'Bind', N("DNS server") ], - inn => [ 'Inn', N("News server") ], +# inn => [ 'Inn', N("News server") ], nfs => [ 'NFS', N("NFS server") ], - kolab => [ 'Kolab', N("Kolab server") ], +# kolab => [ 'Kolab', N("Kolab server") ], proftpd => [ 'Proftpd', N("FTP server") ], ), ); diff --git a/drakwizard.spec b/drakwizard.spec index ea2be0eb..46021546 100644 --- a/drakwizard.spec +++ b/drakwizard.spec @@ -1,6 +1,6 @@ %define name drakwizard %define version 3.0 -%define release %mkrel 27 +%define release %mkrel 28 Name: %{name} Version: %{version} @@ -17,7 +17,7 @@ Prefix: %{_prefix} Obsoletes: wizards_lib-dhcp wizards_lib-ftp wizards_lib-web wizards_lib wizard wizards_lib-time wizards_lib-global wizards_lib-dns wizards_lib-server wizards_lib-proxy wizards_lib-db wizards_lib-news wizards_lib-firewall wizards_lib-client wizards_lib-common wizards_lib-postfix Provides: wizards_lib-dhcp wizards_lib-ftp wizards_lib-web wizards_lib wizard wizards_lib-time wizards_lib-global wizards_lib-dns wizards_lib-server wizards_lib-proxy wizards_lib-db wizards_lib-news wizards_lib-firewall wizards_lib-client wizards_lib-common wizards_lib-postfix Summary: Wizard Launcher and its collection of wizards -URL: http://cvs.mandriva.com/cgi-bin/cvsweb.cgi/soft/wizard_perl +URL: http://qa.mandriva.com/twiki/bin/view/Main/DrakWizard %description drakwizard allows you to launch : @@ -25,6 +25,7 @@ drakwizard allows you to launch : - global wizard: wizard that launch each other. - dhcpd, dns, ftp, nis, ldap, apache, news, time wizards, ssh. +http://cvs.mandriva.com/cgi-bin/cvsweb.cgi/soft/wizard_perl %package base Summary: Base of Wizard Launcher @@ -92,6 +93,13 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME %_datadir/wizards/proxy_wizard %changelog +* Wed Jun 21 2006 Antoine Ginies <aginies@mandriva.com> 3.0-28mdv2007.0 +- 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) + * Tue Jun 20 2006 Antoine Ginies <aginies@mandriva.com> 3.0-27mdv2007.0 - fix problem of fixed list and value in summary diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm index e5855971..99f1dd3e 100755 --- a/ftp_wizard/Proftpd.pm +++ b/ftp_wizard/Proftpd.pm @@ -121,7 +121,7 @@ $o->{pages} = { $o->{var}{wiz_default_root} ||= 1; $o->{var}{wiz_ftp_resume} ||= 1; $o->{var}{wiz_ftp_fxp} ||= 0; - $o->{var}{wiz_port} = $ftp_port; + if (-e $ftp_port) { $o->{var}{wiz_port} = $ftp_port } else { $o->{var}{wiz_port} = "21" }; }, data => [ { label => N('FTP Port:'), val => \$o->{var}{wiz_port}, help => 'Default port is 21 for an FTP server' }, @@ -143,7 +143,7 @@ $o->{pages} = { next => 'config' }, summary => { - name => N("Configuring the FTP server") . "\n\n" . N("The wizard collected the following parameters needed to configure your FTP server") . "\n" . N("To accept those values, and configure your server, click the next button or use the back button to correct them"), + name => N("The wizard collected the following parameters needed to configure your FTP server") . "\n" . N("To accept those values, and configure your server, click the next button or use the back button to correct them"), pre => sub { $o->{var}{internal} = $o->{var}{wiz_ftp_internal} ? N("enabled") : N("disabled"); $o->{var}{external} = $o->{var}{wiz_ftp_external} ? N("enabled") : N("disabled"); diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm index eb10d4ca..65f6dfca 100644 --- a/nisautofs_wizard/Nisautofs.pm +++ b/nisautofs_wizard/Nisautofs.pm @@ -71,23 +71,32 @@ $o->{pages} = { next => 'nis_server', }, nis_server => { - name => N("NIS server with autofs map") . "\n" . N("A NIS server is useful to create user, hostname database. The wizard builds autofs map, so it will provide the capabilities for NIS user to automount their home directory on a NIS client computer.") . "\n\n" . N("NIS server: name of your computer.") . "\n" . N("Home NIS: home base directory for users on NIS server. This directory will be exported through NFS server.") . "\n" . N("NIS domain: NIS domain to use (generally same as your DNS domain name)."), + name => N("NIS server with autofs map") . "\n" . N("A NIS server is useful to create user, hostname database. The wizard builds autofs map, so it will provide the capabilities for NIS user to automount their home directory on a NIS client computer.") . "\n\n" . N("NIS server: name of your computer.") . "\n" . N("NIS domain: NIS domain to use (generally same as your DNS domain name)."), data => [ { label => N("NIS server:"), val => $HOST }, - { label => N("Home NIS:"), val => \$o->{var}{HOMENIS} }, { label => N("NIS domainname:"), val => \$o->{var}{NISDOMAIN} }, - { text => N("Create home NIS directory if it doesn't exist"), type => 'bool', val => \$o->{var}{create_missing_directory} }, ], complete => sub { - if (!-d $o->{var}{HOMENIS} and $o->{var}{create_missing_directory}) { - mkdir_p($o->{var}{HOMENIS}); - } elsif (!-d $o->{var}{HOMENIS}) { - $::in->ask_warn(N("Warning"), N("Directory doesn't exist. Please create it manually.")); - return 0; } if ($o->{var}{NISDOMAIN} eq '(none)' || !$o->{var}{NISDOMAIN}) { return 'error_nisd' } }, - next => 'summaryserver', + next => 'nis_server2', }, + nis_server2 => { + name => N("Home NIS: home base directory for users on NIS server. This directory will be exported through NFS server."), + pre => sub { $o->{var}{wiz_} = $p->{}; }, + data => [ + { label => N("Home NIS:"), val => \$o->{var}{HOMENIS} }, + { text => N("Create home NIS directory if it doesn't exist"), type => 'bool', val => \$o->{var}{create_missing_directory} }, + ], + complete => sub { + if (!-d $o->{var}{HOMENIS} and $o->{var}{create_missing_directory}) { + mkdir_p($o->{var}{HOMENIS}); + } elsif (!-d $o->{var}{HOMENIS}) { + $::in->ask_warn(N("Warning"), N("Directory doesn't exist. Please create it manually.")); + return 0; } + }, + next => 'summaryserver', + }, summaryserver => { name => N("The wizard will set your NIS server with autofs map"), data => [ diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm index ad35c822..1a2da921 100755 --- a/samba_wizard/Samba.pm +++ b/samba_wizard/Samba.pm @@ -104,7 +104,7 @@ $o->{pages} = { # detect old Samba type my ($old_type) = $data =~ /type=(\d)/; $o->{var}{wiz_type} = chomp_($old_type); - } else { $o->{var}{wiz_type} = 2 } + } else { $o->{var}{wiz_type} = 3 } }, post => sub { if ($o->{var}{wiz_type} == 2) { @@ -320,7 +320,7 @@ $o->{pages} = { next => 'ask_log', }, ask_log => { - name => N("Samba Log") . "\n\n" . N("Log file: use file.%m to use a separate log file for each machine that connects") . "\n" . N("Log level: set the log (verbosity) level (0 <= log level <= 10)") . "\n" . N("Max Log size: put a capping on the size of the log files (in Kb)."), + name => N("Samba Log") . "\n" . N("Log file: use file.%m to use a separate log file for each machine that connects") . "\n" . N("Log level: set the log (verbosity) level (0 <= log level <= 10)") . "\n" . N("Max Log size: put a capping on the size of the log files (in Kb)."), pre => sub { $o->{var}{wiz_log_file} ||= $samba->{global}{'log file'}; $o->{var}{wiz_log_level} ||= $samba->{global}{'log level'}; @@ -334,7 +334,7 @@ $o->{pages} = { next => 'summary', }, summary => { - name => N("Configuring Samba") . "\n\n" . N("The wizard collected the following parameters to configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them.") . "\n" . N("If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."), + name => N("The wizard collected the following parameters to configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them.") . "\n" . N("If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."), pre => sub { $o->{var}{wiz_sambatype} = $type{$o->{var}{wiz_type}}; }, diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm index 5b262dbb..b90658d5 100755 --- a/samba_wizard/Sambashare.pm +++ b/samba_wizard/Sambashare.pm @@ -347,6 +347,7 @@ $o->{pages} = { } else { return 0 } }, next => 'add_share_options', + no_back => 1, }, add_cdrom_share => { name => N("Share a CDROM"), @@ -607,18 +608,19 @@ $o->{pages} = { no_back => 1, }, summary_modify_homes_share => { - name => N("Summary of modify homes share"), - data => [ - { label => N("Comment:"), val_ref => \$o->{var}{wiz_homes_comment} }, - { label => N("Writable:"), val_ref => \$o->{var}{wiz_homes_writable} }, - { label => N("Browseable:"), val_ref => \$o->{var}{wiz_homes_browseable} }, - { label => N("Create mode:"), val_ref => \$o->{var}{wiz_homes_create_mode} }, - { label => N("Create mask:"), val_ref => \$o->{var}{wiz_homes_create_mask} }, - { label => N("Directory mask:"), val_ref => \$o->{var}{wiz_homes_directory_mask} }, - ], - post => \&do_it_modify_homes_share, - next => 'end_add_user_share', - }, + name => N("Summary of modify homes share"), + data => [ + { label => N("Comment:"), val_ref => \$o->{var}{wiz_homes_comment} }, + { label => N("Writable:"), val_ref => \$o->{var}{wiz_homes_writable} }, + { label => N("Browseable:"), val_ref => \$o->{var}{wiz_homes_browseable} }, + { label => N("Create mode:"), val_ref => \$o->{var}{wiz_homes_create_mode} }, + { label => N("Create mask:"), val_ref => \$o->{var}{wiz_homes_create_mask} }, + { label => N("Directory mask:"), val_ref => \$o->{var}{wiz_homes_directory_mask} }, + ], + post => \&do_it_modify_homes_share, + next => 'end_add_user_share', + no_back => 1, + }, summary_add_user_share => { name => N("Summary of add a user share") . "\n\n" . N("If you really want to add this share, click the Next button or use the Back button."), data => [ @@ -648,37 +650,44 @@ $o->{pages} = { store_samba_type($o->{var}{wiz_type}); }, end => 1, - next => 0 + next => 0, + no_back => 1, }, end_modify_share => { - name => N("Congratulations") . "\n\n" . N("The wizard successfully modified your share."), - end => 1, - next => 0 + name => N("Congratulations") . "\n\n" . N("The wizard successfully modified your share."), + end => 1, + next => 0, + no_back => 1, }, end_add_share => { name => N("Congratulations") . "\n\n" . N("The wizard successfully added your share."), end => 1, - next => 0 + next => 0, + no_back => 1, }, end_add_user_share => { - name => N("Congratulations") . "\n\n" . N("The wizard successfully added your user share."), - end => 1, - next => 0 + name => N("Congratulations") . "\n\n" . N("The wizard successfully added your user share."), + end => 1, + next => 0, + no_back => 1, }, end_add_public_share => { - name => N("Congratulations") . "\n\n" . N("The wizard successfully added your public share."), - end => 1, - next => 0 + name => N("Congratulations") . "\n\n" . N("The wizard successfully added your public share."), + end => 1, + next => 0, + no_back => 1, }, end_add_profiles => { - name => N("Congratulations") . "\n\n" . N("The wizard successfully added your Profiles share."), - end => 1, - next => 0 + name => N("Congratulations") . "\n\n" . N("The wizard successfully added your Profiles share."), + end => 1, + next => 0, + no_back => 1, }, end_delete_share => { name => N("Congratulations") . "\n\n" . N("The wizard successfully removed your share."), end => 1, - next => 0 + next => 0, + no_back => 1, }, error_end => { name => N("Failed"), 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' |