diff options
| -rwxr-xr-x | dhcp_wizard/Dhcp.pm | 4 | ||||
| -rw-r--r-- | dns_wizard/Bind.pm | 3 | ||||
| -rwxr-xr-x | ftp_wizard/Proftpd.pm | 4 | ||||
| -rw-r--r-- | ldap_wizard/Ldap.pm | 4 | ||||
| -rwxr-xr-x | nfs_wizard/NFS.pm | 4 | ||||
| -rw-r--r-- | nisautofs_wizard/Nisautofs.pm | 3 | ||||
| -rwxr-xr-x | postfix_wizard/Postfix.pm | 3 | ||||
| -rwxr-xr-x | proxy_wizard/Squid.pm | 4 | ||||
| -rwxr-xr-x | samba_wizard/Samba.pm | 4 | ||||
| -rwxr-xr-x | samba_wizard/Sambaprint.pm | 4 | ||||
| -rwxr-xr-x | samba_wizard/Sambashare.pm | 4 | ||||
| -rwxr-xr-x | sshd_wizard/Sshd.pm | 4 | ||||
| -rw-r--r-- | time_wizard/Ntp.pm | 4 | ||||
| -rwxr-xr-x | web_wizard/Apache.pm | 3 |
14 files changed, 24 insertions, 28 deletions
diff --git a/dhcp_wizard/Dhcp.pm b/dhcp_wizard/Dhcp.pm index bf2a322b..8d9fa0e1 100755 --- a/dhcp_wizard/Dhcp.pm +++ b/dhcp_wizard/Dhcp.pm @@ -45,9 +45,9 @@ my $o = { interface => $wiz->{net}->default_itf }, needed_rpm => [ 'dhcp-server' ], - defaultimage => "/usr/share/wizards/dhcp_wizard/images/DHCP.png" + defaultimage => "/usr/share/mcc/themes/default/dhcp_server-mdk.png", }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/dhcp_server-mdk.png"; + $o->{pages} = { welcome => { name => N("DHCP Wizard") . "\n\n\n" . N("DHCP is a service that automatically assigns networking addresses to your workstations.") . "\n\n\n" . N("This wizard will help you configuring the DHCP services of your server."), diff --git a/dns_wizard/Bind.pm b/dns_wizard/Bind.pm index addb43e6..0600f326 100644 --- a/dns_wizard/Bind.pm +++ b/dns_wizard/Bind.pm @@ -70,8 +70,9 @@ my $o = { test_host_domain($SHORTHOSTNAME, $DOMAINNAME); }, needed_rpm => [ 'bind' ], + defaultimage => "/usr/share/mcc/themes/default/dns_server-mdk.png", }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/dns_server-mdk.png"; + my %level = ( 1 => N("Master DNS server"), 2 => N("Slave DNS server"), diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm index 99f1dd3e..7fdff7b2 100755 --- a/ftp_wizard/Proftpd.pm +++ b/ftp_wizard/Proftpd.pm @@ -50,9 +50,9 @@ my $o = { wiz_port => '', }, needed_rpm => [ 'proftpd' ], - defaultimage => "$ENV{__WIZ_HOME__}ftp_wizard/images/FTP.png" + defaultimage => "/usr/share/mcc/themes/default/ftp-mdk.png", }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/ftp-mdk.png"; + my %opt = ( "SystemLog" => "/var/log/proftpd/proftpd.log", "TransferLog" => "/var/log/proftpd/xferlog", diff --git a/ldap_wizard/Ldap.pm b/ldap_wizard/Ldap.pm index 5f54f5b6..fca7a4ad 100644 --- a/ldap_wizard/Ldap.pm +++ b/ldap_wizard/Ldap.pm @@ -56,12 +56,12 @@ my $o = { prenom => '', }, needed_rpm => [ 'openldap-servers', 'openldap-clients', 'nss_ldap' ], - defaultimage => "$ENV{__WIZ_HOME__}ldap_wizard/images/ldap.png", + defaultimage => "/usr/share/mcc/themes/default/ldap-mdk.png", init => sub { test_host_domain($wiz_host_name, $DOMAINNAME); } }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/ldap-mdk.png"; + my $ldap_suffix=join(',dc=', split(/\./, chomp_(`hostname -f`))); $ldap_suffix =~ s/[^,]*,//; my $conf_file = "/etc/sysconfig/ldapwiz"; diff --git a/nfs_wizard/NFS.pm b/nfs_wizard/NFS.pm index 66fa2757..4b19dd9e 100755 --- a/nfs_wizard/NFS.pm +++ b/nfs_wizard/NFS.pm @@ -39,9 +39,9 @@ my $o = { wiz_netmask => '' }, needed_rpm => [ 'nfs-utils' ], - defaultimage => "$ENV{__WIZ_HOME__}nfs_wizard/images/NFS.png" + defaultimage => "/usr/share/mcc/themes/default/nfs_server-mdk.png", }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/nfs_server-mdk.png"; + my %level = ( 1 => N("All - No access restriction"), 2 => N("Local Network - access for local network (recommended)") diff --git a/nisautofs_wizard/Nisautofs.pm b/nisautofs_wizard/Nisautofs.pm index 65f6dfca..ce49d8c4 100644 --- a/nisautofs_wizard/Nisautofs.pm +++ b/nisautofs_wizard/Nisautofs.pm @@ -59,11 +59,12 @@ my $o = { create_missing_directory => '', }, needed_rpm => [ 'ypserv', 'ypbind', 'nfs-utils', 'yp-tools', 'nfs-utils-clients' ], + defaultimage => "/usr/share/mcc/themes/default/nisautofs.png", init => sub { test_host_domain($HOST, $NISDOMAIN); }, }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/nisautofs.png"; + $o->{pages} = { welcome => { name => N("NIS server with autofs map") . "\n\n" . N("Setup a NIS server with autofs map, auto.home and auto.master files.") . "\n\n" . N("Users automatically mount their home directory from server, when they log on a NIS client computer network."), diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm index 7074937c..044e27db 100755 --- a/postfix_wizard/Postfix.pm +++ b/postfix_wizard/Postfix.pm @@ -96,9 +96,8 @@ my $o = { 1; }, needed_rpm => [ 'postfix' ], - defaultimage => "$ENV{__WIZ_HOME__}postfix_wizard/images/courrier.png" + defaultimage => "/usr/share/mcc/themes/default/postfix-mdk.png", }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/postfix-mdk.png"; my %type = ( 1 => N("Main mail server"), diff --git a/proxy_wizard/Squid.pm b/proxy_wizard/Squid.pm index 9693494e..7439f1c2 100755 --- a/proxy_wizard/Squid.pm +++ b/proxy_wizard/Squid.pm @@ -64,9 +64,9 @@ my $o = { test_host_domain($SHORTHOSTNAME, $DOMAINNAME); }, needed_rpm => [ 'squid' ], - defaultimage => "$ENV{__WIZ_HOME__}proxy_wizard/images/proxy.png" + defaultimage => "/usr/share/mcc/themes/default/drakproxy-mdk.png", }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/drakproxy-mdk.png"; + $o->{pages} = { welcome => { name => N("Proxy Configuration Wizard") . "\n\n" . N("Squid is a web caching proxy server, it allows faster web access for your local network.") . "\n\n" . N("This wizard will help you in configuring your proxy server."), diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm index 1a2da921..d057f9b1 100755 --- a/samba_wizard/Samba.pm +++ b/samba_wizard/Samba.pm @@ -69,9 +69,9 @@ my $o = { test_host_domain($SHORTHOSTNAME, $DOMAINNAME); }, needed_rpm => [ 'samba-server' ], - defaultimage => "/usr/share/wizards/samba_wizard/images/sambasrv.png" + defaultimage => "/usr/share/wizards/samba_wizard/images/sambasrv.png", }; -$::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/sambasrv.png"; + # we ask glueconf to give us the structure representing /etc/samba/smb.conf if (!-f "/etc/samba/smb.conf") { mkdir_p("/etc/samba/"); cp_af("/usr/share/wizards/samba_wizard/scripts/smb.conf.default", "/etc/samba/smb.conf") } my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf' }); diff --git a/samba_wizard/Sambaprint.pm b/samba_wizard/Sambaprint.pm index b0821be0..d6816a13 100755 --- a/samba_wizard/Sambaprint.pm +++ b/samba_wizard/Sambaprint.pm @@ -44,9 +44,9 @@ my $o = { wiz_printers_browseable => '', wiz_printers_guestok => '', wiz_printers_createmode => '', list_printers => '', }, - defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambaprt-48.png" + defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambaprt-48.png", }; -$::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/IC-sambaprt-48.png"; + # we ask glueconf to give us the structure representing /etc/samba/smb.conf my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf'}); diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm index b90658d5..9545feb2 100755 --- a/samba_wizard/Sambashare.pm +++ b/samba_wizard/Sambashare.pm @@ -53,9 +53,9 @@ my $o = { wiz_understanding => '', }, needed_rpm => [ 'samba-server' ], - defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambashare-48.png" + defaultimage => "/usr/share/wizards/samba_wizard/images/IC-sambashare-48.png", }; -$::Wizard_pix_up = "/usr/share/wizards/samba_wizard/images/IC-sambashare-48.png"; + # we ask glueconf to give us the structure representing /etc/samba/smb.conf my $samba = new Libconf::Glueconf::Samba::Smb_conf({ filename => '/etc/samba/smb.conf'}); diff --git a/sshd_wizard/Sshd.pm b/sshd_wizard/Sshd.pm index f770c856..d458823e 100755 --- a/sshd_wizard/Sshd.pm +++ b/sshd_wizard/Sshd.pm @@ -50,11 +50,9 @@ my $o = { test_host_domain($SHORTHOSTNAME, $DOMAINNAME); }, needed_rpm => [ 'openssh-server' ], - defaultimage => "/usr/share/wizards/sshd_wizard/images/sshd.png" + defaultimage => "/usr/share/wizards/sshd_wizard/images/IC-Dssh-48.png", }; -$::Wizard_pix_up = "/usr/share/wizards/sshd_wizard/images/IC-Dssh-48.png"; - my @yesorno = qw(yes no); push @yesorno, ""; my @yesnoother = qw(yes no without-password forced-commands-only); push @yesnoother, ""; my @syslog = qw(DAEMON USER AUTH LOCAL0 LOCAL1 LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7); push @syslog, ""; diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm index b63197c1..fffd737b 100644 --- a/time_wizard/Ntp.pm +++ b/time_wizard/Ntp.pm @@ -42,11 +42,9 @@ my $o = { wiz_timezone => '' }, needed_rpm => [ 'ntp' ], - defaultimage => "$ENV{__WIZ_HOME__}time_wizard/images/Time.png" + defaultimage => "/usr/share/mcc/themes/default/time-mdk.png", }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/time-mdk.png"; - my $ntp_servers = timezone::ntp_servers(); my %actions = ( diff --git a/web_wizard/Apache.pm b/web_wizard/Apache.pm index 586c97f8..93504bc2 100755 --- a/web_wizard/Apache.pm +++ b/web_wizard/Apache.pm @@ -46,7 +46,7 @@ my $o = { shared_dir => '' }, needed_rpm => [ 'apache-mpm-prefork', 'apache-mod_userdir' ], - defaultimage => "/usr/share/wizards/web_wizard/images/apache.png", + defaultimage => "/usr/share/mcc/themes/default/web_server-mdk.png", init => sub { if (-f $file) { open my $FH, $file or die "$! ($file)"; @@ -66,7 +66,6 @@ my $o = { 1; } }; -$::Wizard_pix_up = "/usr/share/mcc/themes/default/web_server-mdk.png"; $o->{pages} = { welcome => { |