remove and don't install disabled wizards so that mcc doesn't offer to run them

13 files changed, 0 insertions, 1570 deletions

diff --git a/postfix_wizard/.perl_checker b/postfix_wizard/.perl_checker
deleted file mode 100644
index 725f44b4..00000000
--- a/postfix_wizard/.perl_checker
+++ /dev/null
@@ -1 +0,0 @@
-Basedir ..
\ No newline at end of file
diff --git a/postfix_wizard/Makefile b/postfix_wizard/Makefile
deleted file mode 100644
index 154f7b60..00000000
--- a/postfix_wizard/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-
-install2:
-	su -c 'make install'
-
-install:
-	mkdir -p --mode=u=rwx,g=rx,o=rx  ${prefix}/share/wizards
-	mkdir -p --mode=u=rwx,g=rx,o=rx  ${prefix}/share/wizards/postfix_wizard
-	mkdir -p --mode=u=rwx,g=rx,o=rx  ${prefix}/share/wizards/postfix_wizard/scripts
-	mkdir -p --mode=u=rwx,g=rx,o=rx  ${prefix}/share/wizards/postfix_wizard/images
-	install --mode=u=rw,g=r,o=r -p postfix.wiz ${prefix}/share/wizards/postfix_wizard
-	install --mode=u=rw,g=r,o=r -p scripts/main.cf.dist.default ${prefix}/share/wizards/postfix_wizard
-	install --mode=u=rwx,g=rx,o=rx -p scripts/Postfixconf.pm ${prefix}/share/wizards/postfix_wizard/scripts
-	install --mode=u=rwx,g=rx,o=rx -p scripts/*.sh ${prefix}/share/wizards/postfix_wizard/scripts
-	install --mode=u=rwx,g=rx,o=rx -p images/*.png ${prefix}/share/wizards/postfix_wizard/images
-
-run:	
-	(su -c "make install; unset WIZPATH; export DEBUG_WIZ='/dev/pts/0'; wiz /usr/share/wizards/time_wizard/time.wiz")
-
-desktop:
-	cp -f desktop_data/time\ wiz ${HOME}/Desktop
-	cp -f desktop_data/util1.gif ${HOME}/.kde/share/icons/
diff --git a/postfix_wizard/Postfix.pm b/postfix_wizard/Postfix.pm
deleted file mode 100755
index 044e27db..00000000
--- a/postfix_wizard/Postfix.pm
+++ /dev/null
@@ -1,404 +0,0 @@
-#!/usr/bin/perl
-
-# Drakwizard
-
-# Copyright (C) 2002, 2005 Mandrakesoft
-#
-# Authors: Antoine Ginies <aginies at mandriva.com>
-#          Arnaud Desmons <adesmons@mandrakesoft.com>
-#          Florent Villard <warly@mandrakesoft.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-package MDK::Wizard::Postfix;
-use strict;
-use lib qw(/usr/lib/libDrakX); # required for service package
-
-use common;
-use MDK::Wizard::Wizcommon;
-use MDK::Wizard::Varspaceval;
-
-use Libconf qw(:functions);
-use Libconf::Glueconf::Postfix::Main_cf;
-
-
-my $default_conf = "/etc/postfix/main.cf.dist";
-# provide a default postfix configuration file
-!-d mkdir("/etc/postfix/") and mkdir("/etc/postfix/");
-!-f $default_conf and cp_af("/usr/share/wizards/postfix_wizard/scripts/main.cf.dist.default", $default_conf);
-if (!-f "/etc/postfix/main.cf") { cp_af($default_conf, "/etc/postfix/main.cf") }
-my $postfix = new Libconf::Glueconf::Postfix::Main_cf({ filename => '/etc/postfix/main.cf',  });
-use Data::Dumper;
-print Dumper($postfix);
-
-my $wiz = new MDK::Wizard::Wizcommon;
-my $in = interactive->vnew;
-my $wiz_domain_name = $wiz->{net}->network_get("DOMAINNAME");
-my $wiz_host_name = $wiz->{net}->network_get("HOSTNAME");
-my $wiz_postfix_etc = "/etc/sysconfig/wizard_postfix";
-
-my ($IPSERVER_MASQ) = `/sbin/ip addr show dev eth1` =~ /^\s*inet\s+(\d+\.\d+\.\d+)\.\d+/m;
-
-my $o = {
-	 name => N("Postfix wizard"),
-	 var => {
-		 wiz_myhostname => '',
-		 wiz_mydomain => '',
-		 wiz_myorigin => '',
-		 wiz_inet_interfaces => '',
-		 wiz_mydestination => '',
-		 wiz_mynetworks => '',
-
-		 wiz_smtpd_helo_required => '',
-		 wiz_disable_vrfy_command => '',
-
-		 wiz_maximal_queue_lifetime => '',
-		 wiz_message_size_limit => '',
-		 wiz_smtpd_banner => '',
-
-		 wiz_debug_peer_level => '',
-		 wiz_debugger_command => '',
-		 wiz_delay_warning_time => '',
-
-		 wiz_sendmail_path => '',
-		 wiz_newaliases_path => '',
-		 wiz_mailq_path => '',
-		 wiz_setgid_group => '',
-		 wiz_manpage_directory => '',
-		 wiz_sample_directory => '',
-		 wiz_readme_directory => '',
-		 wiz_html_directory => '',
-
-		 wiz_masquerade_domains => '',
-
-		 wiz_mail_masquerade => '',
-		 wiz_relayhost => '',
-		 wiz_relay_domains => '',
-		},
-	 init => sub {
-	   check_sendmail();
-	   my $t = any { /$wiz_host_name/ } cat_("/etc/hosts");
-	   if ($t == 0) {
-	     return 0, N("Error, can't find your hostname in /etc/hosts. Exiting. Please launch drakconnect and choose static IP address.");
-	   }
-	   1;
-	 },
-	 needed_rpm => [ 'postfix' ],
-	 defaultimage => "/usr/share/mcc/themes/default/postfix-mdk.png",
-	};
-
-my %type = (
-             1 => N("Main mail server"),
-             2 => N("Relay mail server"),
-             );
-
-my %understanding = (
-		     1 => N("Newbie - classical options"),
-		     2 => N("Expert - advanced options"),
-		    );
-
-my @yesorno = qw(yes no); push @yesorno, "";
-
-$o->{pages} = {
-	       welcome => {
-			   name => N("Internet mail configuration wizard") . "\n\n" . N("This wizard will help you configure a Postfix mail server or a Postfix mail relay."),
-			   no_back => 1,
-                           pre => sub {
-			     $postfix->{relayhost} and $o->{var}{wiz_type} = 2;
-                             if (-f $wiz_postfix_etc) {
-                               $in->ask_warn(N("Information"), N("It seems you previously setup a Postfix configuration. This wizard will re-read your old configuration, and show you the Postfix server type you choose")) or $in->exit;
-                               my $data = cat_($wiz_postfix_etc);
-                               # detect old Postfix type
-			       my ($old_type) = $data =~ /type=(\d)/;
-                               $o->{var}{wiz_type} = chomp_($old_type);
-                             } else { $o->{var}{wiz_type} = 1 }
-                           },
-                           data => [
-                                    { label => N("What do you want to do:"), val => \$o->{var}{wiz_type}, list => [ keys %type ], format => sub { $type{$_[0]} } },
-                                   ],
-			   next => 'global_config',
-			  },
-	       understanding => {
-				 name => N('Now I need to know your understanding in Postfix server configuration'),
-				 data => [
-					  { label => N("What kind of user are you:"), val => \$o->{var}{wiz_understanding}, list => [ keys %understanding ], format => sub { $understanding{$_[0]} } },
-					 ],
-				 no_back => 1,
-				 next => 'global_config',
-				},
-	       global_config => {
-				 name => N('Global postfix configuration'),
-				 pre => sub {
-				   $o->{var}{wiz_smtpd_banner} ||= $postfix->{smtpd_banner};
-				   $o->{var}{wiz_myhostname} ||= $postfix->{myhostname} or $o->{var}{wiz_myhostname} = $wiz_host_name;
-				   $o->{var}{wiz_mydomain} ||= $postfix->{mydomain} or $o->{var}{wiz_mydomain} = $wiz_domain_name;
-				   $o->{var}{wiz_myorigin} ||= $postfix->{myorigin};
-				 },
-				 post => sub {
-				   if ($o->{var}{wiz_type} == 1) {
-				     return 'main_server' ;
-				   } else {
-				     return 'relay_server';
-				   }
-				 },
-				 data => [
-					  { label => N('Smtpd banner:'), val => \$o->{var}{wiz_smtpd_banner}, help => 'You MUST specify $myhostname at the start of the text. That is an RFC requirement. ie: $myhostname ESMTP $mail_name ($mail_version) (Mandriva Linux)' },
-					  { label => N('Hostname:'), val => \$o->{var}{wiz_myhostname}, help => N('The myhostname parameter specifies the internet hostname of this  mail system. ie: myhostname = myhostname') },
-					  { label => N('Domain:'), val => \$o->{var}{wiz_mydomain}, help => N('The mydomain parameter specifies the local internet domain name. ie: mydomain = mydomain') },
-					  { label => N('Origin:'), val => \$o->{var}{wiz_myorigin}, help => N('The myorigin parameter specifies the domain that locally-posted mail appears to come from. ie: myorigin = $myhostname') },
-					 ],
-				 complete => sub {
-				   if (!$o->{var}{wiz_smtpd_banner}) {
-				     $in->ask_warn(N('Error'), N('Please provide an Smtpd banner.')); return 1; }
-				   if (!$o->{var}{wiz_myhostname}) {
-				     $in->ask_warn(N('Error'), N('You must provide an internet hostname of this mail system.')); return 1; }
-				   if (!$o->{var}{wiz_mydomain}) {
-				     $in->ask_warn(N('Error'), N('You must specify the local internet domain name.')); return 1; }
-				 },
-				},
-	       main_server => {
-			       name => N('Main Postfix server') . "\n\n" . N('helo_required: require that a remote SMTP client introduces itself at the beginning of an SMTP session with the HELO or EHLO command.') . "\n" . N('Verify command: this stops some techniques used to harvest email addresses.'),
-				pre => sub {
-				  $o->{var}{wiz_smtpd_helo_required} ||= $postfix->{smtpd_helo_required};
-				  $o->{var}{wiz_disable_vrfy_command} ||= $postfix->{disable_vrfy_command};
-				  $o->{var}{wiz_masquerade_domains} ||=$postfix->{masquerade_domains};
-				},
-			       data => [
-					{ label => N('helo required:'), val => \$o->{var}{wiz_smtpd_helo_required}, list_ref => \@yesorno },
-					{ label => N('Disable verify command:'), val => \$o->{var}{wiz_disable_vrfy_command}, list_ref => \@yesorno },
-					{ label => N('Masquerade domains'), val => \$o->{var}{wiz_masquerade_domains}, help => N('This should be chosen consistently with the address you use for incoming mail. Address masquerading is a method to hide all hosts inside a domain behind their mail gateway, and to make it appear as if the mail comes from the gateway itself, instead of from individual machines.') },
-				       ],
-			       complete => sub {
-				 if ($o->{var}{wiz_masquerade_domains} !~ /\w+\.\w+\s\w+\.\w+$/ and $o->{var}{wiz_masquerade_domains}) {
-				   $in->ask_warn(N("Error"), N("Masquerade should be a valid domain name such as \"domain_to_masquerade.com with_this_domain.com\"!"));
-				   return 1;
-				 } else { return 0; };
-			       },
-			       next => 'message_config',
-			      },
-	       relay_server => {
-				name => N('Relay server') . N('Relay domains: what destination domains (and subdomains thereof) this system will relay mail to.') . "\n" ,
-				pre => sub {
-				  $o->{var}{wiz_relayhost} ||= $postfix->{relayhost};
-				  $postfix->{relay_domains} and $o->{var}{wiz_relay_domains} = $postfix->{relay_domains} or $o->{var}{wiz_relay_domains} = $wiz_domain_name;
-				},
-			       data => [
-					{ label => N('Relay host:'), val => \$o->{var}{wiz_relayhost}, help => 'The default host to send non-local mail to when no entry is matched in the optional transport(5) table. ie: relayhost = [gateway.my.domain], relayhost = uucphost, relayhost = [an.ip.add.ress].' },
-					{ label => N('Relay domains:'), val => \$o->{var}{wiz_relay_domains}, help => N('What destination domains (and subdomains thereof) this system will relay mail to. ie: mydomain.com') },
-				       ],
-				complete => sub { if (!$o->{var}{wiz_relayhost}) { $in->ask_warn(N('Error'), N('Need a relayhost.')); return 1; } else { return 0; }; },
-				next => 'message_config',
-			       },
-	       network_config => {
-				  name => N('Network config'),
-				  pre => sub {
-				    $postfix->{inet_interfaces} and $o->{var}{wiz_inet_interfaces} = $postfix->{inet_interfaces} or $o->{var}{wiz_inet_interfaces} = 'all';
-				    $postfix->{mydestination} and $o->{var}{wiz_mydestination} = $postfix->{mydestination} or $o->{var}{wiz_mydestination} = "\$myhostname, localhost.\$mydomain";
-				    my $mynetworks;
-				    $IPSERVER_MASQ and $mynetworks = "127.0.0.0/32, " . $IPSERVER_MASQ . ".0/24" or $mynetworks = "127.0.0.0/32";
-				    $postfix->{mynetworks} and $o->{var}{wiz_mynetworks} = $postfix->{mynetworks} or $o->{var}{wiz_mynetworks} = $mynetworks;
-				    $o->{var}{wiz_mynetworks_style} ||= $postfix->{mynetworks_style};
-				  },
-				  data => [
-					   { label => N('inet interfaces:'), val => \$o->{var}{wiz_inet_interfaces}, help => N('The network interface addresses that this mail system receives mail on. By default, the software claims all active interfaces on the machine. ie: all') },
-					   { label => N('my destination:'), val => \$o->{var}{wiz_mydestination}, help => N('The list of domains that are delivered via the $local_transport mail delivery transport. ie: $myhostname, localhost.$mydomain, /etc/postfix/destinations') },
-					   { label => N('my networks:'), val => \$o->{var}{wiz_mynetworks}, help => N('The list of trusted SMTP clients. ie: 127.0.0.0/32, 192.168.1.0/24') },
-					  ],
-				  complete => sub { if (!$o->{var}{wiz_mynetworks}) { $in->ask_warn(N('Error'), N('This is the list of trusted SMTP clients. For security reason, please provide one. ie: 127.0.0.0/32, 192.168.1.0/24')); return 1; } else { return 0; }; },
-				  post => sub {
-				    if ($o->{var}{wiz_type} == 1) {
-				      return 'summary_main' ;
-				    } else {
-				      return 'summary_relay';
-				    }
-				  }
-				 },
-	       message_config => {
-				  name => N('Message options') . N('Various options to configure your message queue, delay, size...'),
-				  pre => sub {
-				    $postfix->{maximal_queue_lifetime} and $o->{var}{wiz_maximal_queue_lifetime} = $postfix->{maximal_queue_lifetime} or $o->{var}{wiz_maximal_queue_lifetime} = "5d";
-				    $postfix->{message_size_limit} and $o->{var}{wiz_message_size_limit} = $postfix->{message_size_limit} or $o->{var}{wiz_message_size_limit} = "10240000";
-				    $o->{var}{wiz_delay_warning_time} ||= $postfix->{delay_warning_time} or $postfix->{delay_warning_time} = "2h";
-				  },
-				  data => [
-					   { label => N('Maximal queue life:'), val => \$o->{var}{wiz_maximal_queue_lifetime}, help => N('Determines how long a message should stay in the queue before it is deemed undeliverable. The default is five days (5d)') },
-					   { label => N('Message size limit:'), val => \$o->{var}{wiz_message_size_limit}, help => N('Maximum size of a message in Kb') },
-					   { label => N('Delay warning time:'), val => \$o->{var}{wiz_delay_warning_time}, help => N('The delay_warning_time specifies after how many hours a warning is sent that mail has not yet been delivered.') },
-					  ],
-				  next => 'network_config',
-				 },
-	       error_sendmail => {
-				  name => N("Error, sendmail is installed. Please remove it before installing or configuring Postfix"),
-				  no_back => 1,
-				  next => 0,
-				  end => 1,
-				 },
-	       summary_relay => {
-			   name =>  N("Configuring your relay mail server") . "\n\n" . N("The wizard collected the following parameters needed to configure your relay mail server:") . "\n\n" . N("To accept these values, and configure your server, click the next button or use the back button to correct them."),
-			   data => [
-				    { label => N('Relay host:'), val_ref => \$o->{var}{wiz_relayhost} },
-				    { label => N('Relay domains:'), val_ref => \$o->{var}{wiz_relay_domains} },
-				   ],
-			   post => \&do_it_relay_server,
-			   next => 'end'
-			  },
-	       summary_main => {
-				name =>  N("The wizard will now configure your Postfix mail server."),
-				data => [
-					 { label => N('inet interfaces:'), val_ref => \$o->{var}{wiz_inet_interfaces} },
-					 { label => N('my destination:'), val_ref => \$o->{var}{wiz_mydestination} },
-					 { label => N('my networks:'), val_ref => \$o->{var}{wiz_mynetworks} },
-					],
-				post => \&do_it_main_server,
-				next => 'end'
-			     },
-	       end => {
-		       name => N("Congratulations") . "\n\n" . N("The wizard successfully configured your Postfix Mail server."),
-		       post => sub {
-			 store_postfix_type($o->{var}{wiz_type});
-		       },
-		       no_back => 1,
-		       end => 1,
-		       next => 0
-		      },
-	       error_end => {
-			     name => N("Failed"),
-                             data => [ { label => N("Please relaunch drakwizard, and try to change some parameters.") } ],
-                             no_back => 1,
-                             end => 1,
-                             next => 0,
-                            },
-};
-
-sub new {
-    my ($class) = @_;
-    bless $o, $class;
-}
-
-sub check_sendmail {
-  my $in = 'interactive'->vnew('su', 'Check sendmail');
-  my $w = $in->wait_message(N("Postfix Server"), N("removing Sendmail to avoid conflict...."));
-  my $test = any { /sendmail/ } system("rpm -q sendmail");
-  !$test or return 'error_sendmail';
-  undef $w;
-}
-
-sub postfix_options {
-  # global
-  $o->{var}{wiz_myhostname} and $postfix->{myhostname} = $o->{var}{wiz_myhostname};
-  $o->{var}{wiz_mydomain} and $postfix->{mydomain} = $o->{var}{wiz_mydomain};
-  $o->{var}{wiz_myorigin} and $postfix->{myorigin} = $o->{var}{wiz_myorigin};
-  $o->{var}{wiz_inet_interfaces} and $postfix->{inet_interfaces} = $o->{var}{wiz_inet_interfaces};
-  $o->{var}{wiz_mydestination} and $postfix->{mydestination} = $o->{var}{wiz_mydestination};
-  $o->{var}{wiz_mynetworks} and $postfix->{mynetworks} = $o->{var}{wiz_mynetworks};
-  $o->{var}{wiz_smtpd_banner} and $postfix->{smtpd_banner} = $o->{var}{wiz_smtpd_banner};
-
-  # not defined but wanted
-  $postfix->{debug_peer_level} or $postfix->{debug_peer_level} = "1";
-  #$postfix->{debugger_command} or $postfix->{debugger_command} = "PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin xxgdb $daemon_directory/$process_name $process_id & sleep 5";
-  $postfix->{sendmail_path} or $postfix->{sendmail_path} = "/usr/sbin/sendmail.postfix";
-  $postfix->{newaliases_path} or $postfix->{newaliases_path} = "/usr/bin/newaliases.postfix";
-  $postfix->{mailq_path} or $postfix->{mailq_path} = "/usr/bin/mailq.postfix";
-  $postfix->{setgid_group} or $postfix->{setgid_group} = "postdrop";
-  $postfix->{alias_maps} or $postfix->{alias_maps} = "hash:/etc/postfix/aliases";
-  $postfix->{mail_spool_directory} or $postfix->{mail_spool_directory} = "/var/spool/mail";
-  $postfix->{alias_database} or $postfix->{alias_database} = "hash:/etc/postfix/aliases";
-  $postfix->{command_directory} or $postfix->{command_directory} = "/usr/sbin";
-  $postfix->{queue_directory} or $postfix->{queue_directory} = "/var/spool/postfix";
-  $postfix->{daemon_directory} or $postfix->{daemon_directory} = "/usr/lib/postfix";
-  $postfix->{mail_owner} or $postfix->{mail_owner} = "postfix";
-}
-
-sub store_postfix_type {
-# write config file to store Postfix type
-  my ($type) = @_;
-  output($wiz_postfix_etc, <<EOF);
-# 1 = Main server
-# 2 = Relay
-# 3 = mail server + fetchmail
-EOF
-
-  append_to_file($wiz_postfix_etc, "type=$type\n");
-}
-
-sub save_config {
-  my @conf = qw(/etc/postfix/aliases
-		  /etc/postfix/canonical
-		  /etc/postfix/main.cf
-		  /etc/postfix/master.cf
-		  /etc/postfix/virtual);
-    foreach (@conf) {
-        -f $_ and MDK::Common::cp_af($_, $_.".orig");
-    }
-}
-
-sub cmd_needed {
-  system("/usr/sbin/postmap -r -w /etc/postfix/canonical");
-  system("/usr/sbin/postmap /etc/postfix/virtual");
-  system("/usr/sbin/postalias /etc/postfix/aliases");
-  system("/usr/sbin/postfix check");
-  $postfix->write_conf("/etc/postfix/main.cf");
-  require services;
-  if (services::is_service_running('postfix')) {
-    services::restart('postfix');
-  } else {
-    services::start('postfix');
-  }
-}
-
-sub do_it_relay_server {
-  $::testing and return;
-  my $in = 'interactive'->vnew('su', 'postfix configuration');
-  my $w = $in->wait_message(N("Postfix Server"), N("Configuring your Postfix server....."));
-  save_config();
-
-  postfix_options();
-  $o->{var}{wiz_relayhost} and $postfix->{relayhost} = $o->{var}{wiz_relayhost};
-  $o->{var}{wiz_relay_domains} and $postfix->{relay_domains} = $o->{var}{wiz_relay_domains};
-
-  # remove server unwanted options
-  $postfix->{smtpd_helo_required} and delete $postfix->{smtpd_helo_required};
-  $postfix->{disable_vrfy_command} and delete $postfix->{disable_vrfy_command};
-  $postfix->{masquerade_domains} and delete $postfix->{masquerade_domains};
-
-  cmd_needed();
-  undef $w;
-  check_started('master');
-}
-
-sub do_it_main_server {
-  $::testing and return;
-  my $in = 'interactive'->vnew('su', 'postfix configuration');
-  my $w = $in->wait_message(N("Postfix Server"), N("Configuring your Postfix server....."));
-  save_config();
-
-  postfix_options();
-  $o->{var}{wiz_smtpd_helo_required} and $postfix->{smtpd_helo_required} = $o->{vawiz_smtpd_helo_required};
-  $o->{var}{wiz_disable_vrfy_command} and $postfix->{disable_vrfy_command} = $o->{var}{wiz_disable_vrfy_command};
-  $o->{var}{wiz_maximal_queue_lifetime} and $postfix->{maximal_queue_lifetime} = $o->{var}{wiz_maximal_queue_lifetime};
-  $o->{var}{wiz_message_size_limit} and $postfix->{message_size_limit} = $o->{var}{wiz_message_size_limit};
-  $o->{var}{wiz_masquerade_domains} and $postfix->{masquerade_domains} = $o->{var}{wiz_masquerade_domains};
-  $o->{var}{wiz_delay_warning_time} and $postfix->{delay_warning_time} = $o->{var}{wiz_delay_warning_time};
-
-  # remove relay options
-  $postfix->{relayhost} and delete $postfix->{relayhost};
-  $postfix->{relay_domains} and delete $postfix->{relay_domains};
-
-  cmd_needed();
-  undef $w;
-  check_started('master');
-}
-
-1;
diff --git a/postfix_wizard/postfix_main.txt b/postfix_wizard/postfix_main.txt
deleted file mode 100644
index e10f5d9d..00000000
--- a/postfix_wizard/postfix_main.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-queue_directory = /var/spool/postfix
-command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
-
-mail_owner = postfix
-myhostname = test.mdk.com
-mydomain = balvy.loc
-myorigin = $myhostname
-inet_interfaces = all
-mydestination = $myhostname, localhost.$mydomain, /etc/postfix/destinations
-local_recipient_maps =
-
-unknown_local_recipient_reject_code = 450
-mynetworks = 127.0.0.0/32, 192.168.1.0/24
-
-alias_maps = hash:/etc/postfix/aliases
-alias_database = hash:/etc/postfix/aliases
-
-mail_spool_directory = /var/spool/mail
-mailbox_transport = cyrus
-
-header_checks = pcre:/etc/postfix/header_checks
-body_checks = pcre:/etc/postfix/body_checks
-
-smtpd_helo_required = yes
-disable_vrfy_command = yes
-smtpd_recipient_restrictions =
-    reject_invalid_hostname,
-    reject_unknown_sender_domain,
-    reject_unknown_recipient_domain,
-    permit_mynetworks,
-    reject_unauth_destination,
-    reject_rbl_client titi.toto.com,
-    permit
-smtpd_data_restrictions =
-    reject_unauth_pipelining,
-    permit
-
-maximal_queue_lifetime = 2d
-message_size_limit = 20000000
-smtpd_banner = Welcom srv
-
-debug_peer_level = 2
-debugger_command =
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         xxgdb $daemon_directory/$process_name $process_id & sleep 5
-delay_warning_time = 4
-
-sendmail_path = /usr/sbin/sendmail.postfix
-newaliases_path = /usr/bin/newaliases.postfix
-mailq_path = /usr/bin/mailq.postfix
-setgid_group = postdrop
-manpage_directory = /usr/share/man
-sample_directory = /usr/share/doc/postfix-2.1.1/samples
-readme_directory = /usr/share/doc/postfix-2.1.1/README_FILES
-
-masquerade_domains = guibland.com
-default_destination_concurrency_limit = 50
-default_destination_recipient_limit = 50
-content_filter=smtp-filter:[127.0.0.1]:10025
-smtp-amavis_destination_concurrency_limit=2
-html_directory = /usr/share/doc/postfix-2.1.1/html
-content_filter = lmtp-filter:127.0.0.1:10025
-receive_override_options = no_address_mappings
diff --git a/postfix_wizard/postfix_relais.txt b/postfix_wizard/postfix_relais.txt
deleted file mode 100644
index a2d34df8..00000000
--- a/postfix_wizard/postfix_relais.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-queue_directory = /var/spool/postfix
-command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
-mail_owner = postfix
-
-mydomain = mdk.com
-myorigin = $mydomain
-
-mynetworks = 127.0.0.0/8, 192.168.1.0/24
-
-# spécifier la machine sur le réseau local vers laquelle relayer les mails
-relayhost = ip_relay
-# spécifier les domaines à relayer
-relay_domains = guibland.com
-
-unknown_local_recipient_reject_code = 450
-#unknown_local_recipient_reject_code = 550
-
-alias_maps = hash:/etc/postfix/aliases
-
-smtpd_banner = Welcome srv
-
-debug_peer_level = 2
-debugger_command =
-         PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-         xxgdb $daemon_directory/$process_name $process_id & sleep 5
-delay_warning_time = 4
-
-sendmail_path = /usr/sbin/sendmail.postfix
-newaliases_path = /usr/bin/newaliases.postfix
-mailq_path = /usr/bin/mailq.postfix
-setgid_group = postdrop
-manpage_directory = /usr/share/man
-sample_directory = /usr/share/doc/postfix-2.1.1/samples
-readme_directory = /usr/share/doc/postfix-2.1.1/README_FILES
-alias_database = hash:/etc/postfix/aliases
-
-smtpd_recipient_restrictions = reject_unauth_destination
-smtpd_sender_restrictions = permit_mynetworks
-
-message_size_limit = 20000000
-
-masquerade_domains = $mydomain
-html_directory = /usr/share/doc/postfix-2.1.1/html
diff --git a/postfix_wizard/scripts/Postfixconf.pm b/postfix_wizard/scripts/Postfixconf.pm
deleted file mode 100644
index e34234d9..00000000
--- a/postfix_wizard/scripts/Postfixconf.pm
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl
-
-package Postfixconf;
-use lib '/usr/lib/libDrakX';
-require "__WIZ_HOME__/common/scripts/Vareqval.pm";
-require "__WIZ_HOME__/common/scripts/IFCFG.pm";
-use MDK::Common;
-use services;
-use strict;
-
-my $o = IFCFG->new();
-my $wiz_domain_name = $o->network_get("DOMAINNAME");
-my $wiz_host_name = $o->network_get("HOSTNAME");
-
-sub check_masquerade {
-    $ENV{wiz_mail_masquerade} or return 1;
-    $ENV{wiz_mail_masquerade} =~ /@(\S+)$/ or return 1;
-    return 10
-}
-
-sub check_relay {
-    $ENV{wiz_ext_mail_relay} or return 1;
-    $ENV{wiz_ext_mail_relay} =~ /(\S+)\.(\S+)$/ or return 1;
-    return 10;
-}
-
-sub	get_mail_masquerade {
-    my $login = `logname`;
-    my $relayhost = `/usr/sbin/postconf -h relayhost`;
-    chomp($relayhost);
-    ($relayhost) = $relayhost =~ /.*\.(.*\..*)/;
-    !length $relayhost and $relayhost = $wiz_domain_name;
-    chomp($login);
-    "$login\@$relayhost";
-}
-
-sub	get_mail_relay {
-    my $relayhost = `/usr/sbin/postconf -h relayhost`;
-    chomp $relayhost;
-    !length $relayhost and $relayhost = "smtp.$wiz_domain_name";
-    $relayhost;
-}
-
-sub	do_it {
-    my @conf = qw(/etc/postfix/aliases
-		  /etc/postfix/canonical
-		  /etc/postfix/main.cf
-		  /etc/postfix/master.cf
-		  /etc/postfix/virtual);
-    foreach (@conf) {
-        (-f $_) and MDK::Common::cp_af($_, $_.".orig");
-    }
-    @conf = ("myhostname = $wiz_host_name",
-	     'myorigin = $mydomain',
-	     'inet_interfaces = all',
-	     'mydestination = $myhostname, localhost.$mydomain',
-	     'masquerade_domains = $mydomain',
-	     'alias_maps = hash:/etc/postfix/aliases',
-	     'alias_database = hash:/etc/postfix/aliases',
-	     'virtual_maps = hash:/etc/postfix/virtual',
-	     'canonical_maps = hash:/etc/postfix/canonical',
-	     "relayhost = $ENV{wiz_ext_mail_relay}"
-	     );
-    foreach (@conf) {
-	system("/usr/sbin/postconf -e \'$_\'");
-    }
-    if (defined $ENV{wiz_ext_mail_relay}) {
-	my $file = "/etc/postfix/canonical";
-	my $canon = "\n\@$wiz_domain_name $ENV{wiz_mail_masquerade}";
-	my $t;
-	foreach (cat_($file)) {
-	    if (/^\s*(?!\#)\s*\@$wiz_domain_name.*/) {
-		$t = $_;
-		last;
-	    }
-	}
-	if ($t) { substInFile { s|$t|\#$&$canon|} $file } 
-	else { append_to_file($file, $canon) }
-    }
-    system("/usr/sbin/postmap /etc/postfix/canonical");
-    system("/usr/sbin/postmap /etc/postfix/virtual");
-    system("/usr/sbin/postalias /etc/postfix/aliases");
-    system("/usr/sbin/postfix check");
-    if (services::is_service_running('postfix')) {
-	services::restart('postfix') 
-    } else {
-        services::start('postfix')
-    }
-    services::is_service_running('xinetd') and services::restart('xinetd');
-    10;
-}
-
-1;
diff --git a/postfix_wizard/scripts/check_masquerade.sh b/postfix_wizard/scripts/check_masquerade.sh
deleted file mode 100755
index ad0559c6..00000000
--- a/postfix_wizard/scripts/check_masquerade.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-# 
-# Wizard
-#
-# Copyright (C) 2000 Mandrakesoft.
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# See file LICENSE for further informations on licensing terms.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# 
-# Authors: Jerome Dumonteil, Maurizio De Cecco, Enzo Maggi
-# icons: Helene Durosini <ln@mandrakesoft.com>
-# <corporate@mandrakesoft.com> http://www.mandrakesoft.com
-
-# script for wizard postfix configuration
-#
-# checking if the provided domain value is correct :
-# strip the @, need at least a dot
-
-if [ -z "${wiz_mail_masquerade}" ] ;then
-	echo_debug "wiz_mail_masquerade is empty, should not."
-	exit 1
-fi
-
-test=`echo ${wiz_mail_masquerade} |sed -e '/@/{s/^[^@]*@\([^@]*\)$/\1/;}' |grep "\."`
-echo_debug "test of masquerading domain : ${test}"
-
-if [ -z "${test}" ] ;then 
-	echo_debug "domain empty, should not."
-	exit 1
-fi
-if `echo ${test}| grep -q ' '` ;then 
-	echo_debug "bad domain : $test"
-	exit 1
-fi
-
-# all seems to be ok
-exit 10
-
-
-
-
diff --git a/postfix_wizard/scripts/check_relay.sh b/postfix_wizard/scripts/check_relay.sh
deleted file mode 100755
index c7a2368f..00000000
--- a/postfix_wizard/scripts/check_relay.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# 
-# Wizard
-#
-# Copyright (C) 2000 Mandrakesoft.
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# See file LICENSE for further informations on licensing terms.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# 
-# Authors: Jerome Dumonteil, Maurizio De Cecco, Enzo Maggi
-# icons: Helene Durosini <ln@mandrakesoft.com>
-# <corporate@mandrakesoft.com> http://www.mandrakesoft.com
-
-# script for wizard postfix configuration
-#
-# checking if the provided hostname of relay value is correct
-#
-# at least a dot, strip @
-
-
-if [ -z "${wiz_ext_mail_relay}" ]; then
-	echo_debug "wiz_ext_mail_relay is empty, should not."
-	exit 1
-fi
-
-# (no need to skip white space), stripping @, need dot
-
-test=`echo ${wiz_ext_mail_relay} |sed -e '/@/{s/^[^@]*@\([^@]*\)$/\1/;}'|grep "\."`
-echo_debug "test of relay domain : ${test}"
-
-if [ -z "${test}" ] ;then 
-	echo_debug "relay empty, should not."
-	exit 1
-fi
-
-# all seems to be ok
-exit 10
-
diff --git a/postfix_wizard/scripts/compute_mail_relay.sh b/postfix_wizard/scripts/compute_mail_relay.sh
deleted file mode 100755
index b2fc35e6..00000000
--- a/postfix_wizard/scripts/compute_mail_relay.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# 
-# Wizard
-#
-# Copyright (C) 2000 Mandrakesoft.
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# See file LICENSE for further informations on licensing terms.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# 
-# Authors: Jerome Dumonteil, Maurizio De Cecco, Enzo Maggi
-# icons: Helene Durosini <ln@mandrakesoft.com>
-# <corporate@mandrakesoft.com> http://www.mandrakesoft.com
-
-# script for wizard postfix configuration
-#
-# echo on stdout the correct value of wiz_ext_mail_relay
-# (strip @)
-
-
-#stripping @, need dot
-
-test=`echo ${wiz_ext_mail_relay} |sed -e '/@/{s/^[^@]*@\([^@]*\)$/\1/;}' -e 's! .*$!!'`
-echo_debug "relay domain : ${test}"
-
-echo ${test}
-
-# all seems to be ok
-exit 0
-
diff --git a/postfix_wizard/scripts/compute_masquerade.sh b/postfix_wizard/scripts/compute_masquerade.sh
deleted file mode 100755
index a6f37111..00000000
--- a/postfix_wizard/scripts/compute_masquerade.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# 
-# Wizard
-#
-# Copyright (C) 2000 Mandrakesoft.
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# See file LICENSE for further informations on licensing terms.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# 
-# Authors: Jerome Dumonteil, Maurizio De Cecco, Enzo Maggi
-# icons: Helene Durosini <ln@mandrakesoft.com>
-# <corporate@mandrakesoft.com> http://www.mandrakesoft.com
-
-# script for wizard postfix configuration
-#
-# echo on stdout the correct value of wiz_mail_masquerade
-# (strip @)
-
-
-#stripping @
-
-test=`echo ${wiz_mail_masquerade} |sed -e '/@/{s/^[^@]*@\([^@]*\)$/\1/;}'  -e 's! .*$!!'`
-echo_debug "masquerade domain : ${test}"
-
-echo ${test}
-
-# all seems to be ok
-exit 0
-
diff --git a/postfix_wizard/scripts/main.cf.dist.default b/postfix_wizard/scripts/main.cf.dist.default
deleted file mode 100644
index 1267ba64..00000000
--- a/postfix_wizard/scripts/main.cf.dist.default
+++ /dev/null
@@ -1,640 +0,0 @@
-# Global Postfix configuration file. This file lists only a subset
-# of all 300+ parameters. See the postconf(5) manual page for a
-# complete list.
-#
-# The general format of each line is: parameter = value. Lines
-# that begin with whitespace continue the previous line. A value can
-# contain references to other $names or ${name}s.
-#
-# NOTE - CHANGE NO MORE THAN 2-3 PARAMETERS AT A TIME, AND TEST IF
-# POSTFIX STILL WORKS AFTER EVERY CHANGE.
-
-# SOFT BOUNCE
-#
-# The soft_bounce parameter provides a limited safety net for
-# testing.  When soft_bounce is enabled, mail will remain queued that
-# would otherwise bounce. This parameter disables locally-generated
-# bounces, and prevents the SMTP server from rejecting mail permanently
-# (by changing 5xx replies into 4xx replies). However, soft_bounce
-# is no cure for address rewriting mistakes or mail routing mistakes.
-#
-#soft_bounce = no
-
-# LOCAL PATHNAME INFORMATION
-#
-# The queue_directory specifies the location of the Postfix queue.
-# This is also the root directory of Postfix daemons that run chrooted.
-# See the files in examples/chroot-setup for setting up Postfix chroot
-# environments on different UNIX systems.
-#
-queue_directory = /var/spool/postfix
-
-# The command_directory parameter specifies the location of all
-# postXXX commands.
-#
-command_directory = /usr/sbin
-
-# The daemon_directory parameter specifies the location of all Postfix
-# daemon programs (i.e. programs listed in the master.cf file). This
-# directory must be owned by root.
-#
-daemon_directory = /usr/lib/postfix
-
-# QUEUE AND PROCESS OWNERSHIP
-#
-# The mail_owner parameter specifies the owner of the Postfix queue
-# and of most Postfix daemon processes.  Specify the name of a user
-# account THAT DOES NOT SHARE ITS USER OR GROUP ID WITH OTHER ACCOUNTS
-# AND THAT OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In
-# particular, don't specify nobody or daemon. PLEASE USE A DEDICATED
-# USER.
-#
-mail_owner = postfix
-
-# The default_privs parameter specifies the default rights used by
-# the local delivery agent for delivery to external file or command.
-# These rights are used in the absence of a recipient user context.
-# DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
-#
-#default_privs = nobody
-
-# INTERNET HOST AND DOMAIN NAMES
-# 
-# The myhostname parameter specifies the internet hostname of this
-# mail system. The default is to use the fully-qualified domain name
-# from gethostname(). $myhostname is used as a default value for many
-# other configuration parameters.
-#
-#myhostname = host.domain.tld
-#myhostname = virtual.domain.tld
-
-# The mydomain parameter specifies the local internet domain name.
-# The default is to use $myhostname minus the first component.
-# $mydomain is used as a default value for many other configuration
-# parameters.
-#
-#mydomain = domain.tld
-
-# SENDING MAIL
-# 
-# The myorigin parameter specifies the domain that locally-posted
-# mail appears to come from. The default is to append $myhostname,
-# which is fine for small sites.  If you run a domain with multiple
-# machines, you should (1) change this to $mydomain and (2) set up
-# a domain-wide alias database that aliases each user to
-# user@that.users.mailhost.
-#
-# For the sake of consistency between sender and recipient addresses,
-# myorigin also specifies the default domain name that is appended
-# to recipient addresses that have no @domain part.
-#
-#myorigin = $myhostname
-#myorigin = $mydomain
-
-# RECEIVING MAIL
-
-# The inet_interfaces parameter specifies the network interface
-# addresses that this mail system receives mail on.  By default,
-# the software claims all active interfaces on the machine. The
-# parameter also controls delivery of mail to user@[ip.address].
-#
-# See also the proxy_interfaces parameter, for network addresses that
-# are forwarded to us via a proxy or network address translator.
-#
-# Note: you need to stop/start Postfix when this parameter changes.
-#
-inet_interfaces = localhost
-#inet_interfaces = all
-#inet_interfaces = $myhostname
-#inet_interfaces = $myhostname, localhost
-
-# The proxy_interfaces parameter specifies the network interface
-# addresses that this mail system receives mail on by way of a
-# proxy or network address translation unit. This setting extends
-# the address list specified with the inet_interfaces parameter.
-#
-# You must specify your proxy/NAT addresses when your system is a
-# backup MX host for other domains, otherwise mail delivery loops
-# will happen when the primary MX host is down.
-#
-#proxy_interfaces =
-#proxy_interfaces = 1.2.3.4
-
-# The mydestination parameter specifies the list of domains that this
-# machine considers itself the final destination for.
-#
-# These domains are routed to the delivery agent specified with the
-# local_transport parameter setting. By default, that is the UNIX
-# compatible delivery agent that lookups all recipients in /etc/passwd
-# and /etc/aliases or their equivalent.
-#
-# The default is $myhostname + localhost.$mydomain.  On a mail domain
-# gateway, you should also include $mydomain.
-#
-# Do not specify the names of virtual domains - those domains are
-# specified elsewhere (see VIRTUAL_README).
-#
-# Do not specify the names of domains that this machine is backup MX
-# host for. Specify those names via the relay_domains settings for
-# the SMTP server, or use permit_mx_backup if you are lazy (see
-# STANDARD_CONFIGURATION_README).
-#
-# The local machine is always the final destination for mail addressed
-# to user@[the.net.work.address] of an interface that the mail system
-# receives mail on (see the inet_interfaces parameter).
-#
-# Specify a list of host or domain names, /file/name or type:table
-# patterns, separated by commas and/or whitespace. A /file/name
-# pattern is replaced by its contents; a type:table is matched when
-# a name matches a lookup key (the right-hand side is ignored).
-# Continue long lines by starting the next line with whitespace.
-#
-# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
-#
-mydestination = $myhostname, localhost.$mydomain, localhost
-#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
-#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
-#	mail.$mydomain, www.$mydomain, ftp.$mydomain
-
-# REJECTING MAIL FOR UNKNOWN LOCAL USERS
-#
-# The local_recipient_maps parameter specifies optional lookup tables
-# with all names or addresses of users that are local with respect
-# to $mydestination, $inet_interfaces or $proxy_interfaces.
-#
-# If this parameter is defined, then the SMTP server will reject
-# mail for unknown local users. This parameter is defined by default.
-#
-# To turn off local recipient checking in the SMTP server, specify
-# local_recipient_maps = (i.e. empty).
-#
-# The default setting assumes that you use the default Postfix local
-# delivery agent for local delivery. You need to update the
-# local_recipient_maps setting if:
-#
-# - You define $mydestination domain recipients in files other than
-#   /etc/passwd, /etc/aliases, or the $virtual_alias_maps files.
-#   For example, you define $mydestination domain recipients in    
-#   the $virtual_mailbox_maps files.
-#
-# - You redefine the local delivery agent in master.cf.
-#
-# - You redefine the "local_transport" setting in main.cf.
-#
-# - You use the "luser_relay", "mailbox_transport", or "fallback_transport"
-#   feature of the Postfix local delivery agent (see local(8)).
-#
-# Details are described in the LOCAL_RECIPIENT_README file.
-#
-# Beware: if the Postfix SMTP server runs chrooted, you probably have
-# to access the passwd file via the proxymap service, in order to
-# overcome chroot restrictions. The alternative, having a copy of
-# the system passwd file in the chroot jail is just not practical.
-#
-# The right-hand side of the lookup tables is conveniently ignored.
-# In the left-hand side, specify a bare username, an @domain.tld
-# wild-card, or specify a user@domain.tld address.
-# 
-#local_recipient_maps = unix:passwd.byname $alias_maps
-#local_recipient_maps = proxy:unix:passwd.byname $alias_maps
-#local_recipient_maps =
-
-# The unknown_local_recipient_reject_code specifies the SMTP server
-# response code when a recipient domain matches $mydestination or
-# ${proxy,inet}_interfaces, while $local_recipient_maps is non-empty
-# and the recipient address or address local-part is not found.
-#
-# The default setting is 550 (reject mail) but it is safer to start
-# with 450 (try again later) until you are certain that your
-# local_recipient_maps settings are OK.
-#
-unknown_local_recipient_reject_code = 550
-
-# TRUST AND RELAY CONTROL
-
-# The mynetworks parameter specifies the list of "trusted" SMTP
-# clients that have more privileges than "strangers".
-#
-# In particular, "trusted" SMTP clients are allowed to relay mail
-# through Postfix.  See the smtpd_recipient_restrictions parameter
-# in postconf(5).
-#
-# You can specify the list of "trusted" network addresses by hand
-# or you can let Postfix do it for you (which is the default).
-#
-# By default (mynetworks_style = subnet), Postfix "trusts" SMTP
-# clients in the same IP subnetworks as the local machine.
-# On Linux, this does works correctly only with interfaces specified
-# with the "ifconfig" command.
-# 
-# Specify "mynetworks_style = class" when Postfix should "trust" SMTP
-# clients in the same IP class A/B/C networks as the local machine.
-# Don't do this with a dialup site - it would cause Postfix to "trust"
-# your entire provider's network.  Instead, specify an explicit
-# mynetworks list by hand, as described below.
-#  
-# Specify "mynetworks_style = host" when Postfix should "trust"
-# only the local machine.
-# 
-#mynetworks_style = class
-#mynetworks_style = subnet
-mynetworks_style = host
-
-# Alternatively, you can specify the mynetworks list by hand, in
-# which case Postfix ignores the mynetworks_style setting.
-#
-# Specify an explicit list of network/netmask patterns, where the
-# mask specifies the number of bits in the network part of a host
-# address.
-#
-# You can also specify the absolute pathname of a pattern file instead
-# of listing the patterns here. Specify type:table for table-based lookups
-# (the value on the table right-hand side is not used).
-#
-#mynetworks = 168.100.189.0/28, 127.0.0.0/8
-#mynetworks = $config_directory/mynetworks
-#mynetworks = hash:/etc/postfix/network_table
-
-# The relay_domains parameter restricts what destinations this system will
-# relay mail to.  See the smtpd_recipient_restrictions description in
-# postconf(5) for detailed information.
-#
-# By default, Postfix relays mail
-# - from "trusted" clients (IP address matches $mynetworks) to any destination,
-# - from "untrusted" clients to destinations that match $relay_domains or
-#   subdomains thereof, except addresses with sender-specified routing.
-# The default relay_domains value is $mydestination.
-# 
-# In addition to the above, the Postfix SMTP server by default accepts mail
-# that Postfix is final destination for:
-# - destinations that match $inet_interfaces or $proxy_interfaces,
-# - destinations that match $mydestination
-# - destinations that match $virtual_alias_domains,
-# - destinations that match $virtual_mailbox_domains.
-# These destinations do not need to be listed in $relay_domains.
-# 
-# Specify a list of hosts or domains, /file/name patterns or type:name
-# lookup tables, separated by commas and/or whitespace.  Continue
-# long lines by starting the next line with whitespace. A file name
-# is replaced by its contents; a type:name table is matched when a
-# (parent) domain appears as lookup key.
-#
-# NOTE: Postfix will not automatically forward mail for domains that
-# list this system as their primary or backup MX host. See the
-# permit_mx_backup restriction description in postconf(5).
-#
-#relay_domains = $mydestination
-
-# INTERNET OR INTRANET
-
-# The relayhost parameter specifies the default host to send mail to
-# when no entry is matched in the optional transport(5) table. When
-# no relayhost is given, mail is routed directly to the destination.
-#
-# On an intranet, specify the organizational domain name. If your
-# internal DNS uses no MX records, specify the name of the intranet
-# gateway host instead.
-#
-# In the case of SMTP, specify a domain, host, host:port, [host]:port,
-# [address] or [address]:port; the form [host] turns off MX lookups.
-#
-# If you're connected via UUCP, see also the default_transport parameter.
-#
-#relayhost = $mydomain
-#relayhost = [gateway.my.domain]
-#relayhost = [mailserver.isp.tld]
-#relayhost = uucphost
-#relayhost = [an.ip.add.ress]
-
-# REJECTING UNKNOWN RELAY USERS
-#
-# The relay_recipient_maps parameter specifies optional lookup tables
-# with all addresses in the domains that match $relay_domains.
-#
-# If this parameter is defined, then the SMTP server will reject
-# mail for unknown relay users. This feature is off by default.
-#
-# The right-hand side of the lookup tables is conveniently ignored.
-# In the left-hand side, specify an @domain.tld wild-card, or specify
-# a user@domain.tld address.
-# 
-#relay_recipient_maps = hash:/etc/postfix/relay_recipients
-
-# INPUT RATE CONTROL
-#
-# The in_flow_delay configuration parameter implements mail input
-# flow control. This feature is turned on by default, although it
-# still needs further development (it's disabled on SCO UNIX due
-# to an SCO bug).
-# 
-# A Postfix process will pause for $in_flow_delay seconds before
-# accepting a new message, when the message arrival rate exceeds the
-# message delivery rate. With the default 100 SMTP server process
-# limit, this limits the mail inflow to 100 messages a second more
-# than the number of messages delivered per second.
-# 
-# Specify 0 to disable the feature. Valid delays are 0..10.
-# 
-#in_flow_delay = 1s
-
-# ADDRESS REWRITING
-#
-# The ADDRESS_REWRITING_README document gives information about
-# address masquerading or other forms of address rewriting including
-# username->Firstname.Lastname mapping.
-
-# ADDRESS REDIRECTION (VIRTUAL DOMAIN)
-#
-# The VIRTUAL_README document gives information about the many forms
-# of domain hosting that Postfix supports.
-
-# "USER HAS MOVED" BOUNCE MESSAGES
-#
-# See the discussion in the ADDRESS_REWRITING_README document.
-
-# TRANSPORT MAP
-#
-# See the discussion in the ADDRESS_REWRITING_README document.
-
-# ALIAS DATABASE
-#
-# The alias_maps parameter specifies the list of alias databases used
-# by the local delivery agent. The default list is system dependent.
-#
-# On systems with NIS, the default is to search the local alias
-# database, then the NIS alias database. See aliases(5) for syntax
-# details.
-# 
-# If you change the alias database, run "postalias /etc/aliases" (or
-# wherever your system stores the mail alias file), or simply run
-# "newaliases" to build the necessary DBM or DB file.
-#
-# It will take a minute or so before changes become visible.  Use
-# "postfix reload" to eliminate the delay.
-#
-#alias_maps = dbm:/etc/aliases
-alias_maps = hash:/etc/aliases
-#alias_maps = hash:/etc/aliases, nis:mail.aliases
-#alias_maps = netinfo:/aliases
-
-# The alias_database parameter specifies the alias database(s) that
-# are built with "newaliases" or "sendmail -bi".  This is a separate
-# configuration parameter, because alias_maps (see above) may specify
-# tables that are not necessarily all under control by Postfix.
-#
-#alias_database = dbm:/etc/aliases
-#alias_database = dbm:/etc/mail/aliases
-#alias_database = hash:/etc/aliases
-#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-
-# ADDRESS EXTENSIONS (e.g., user+foo)
-#
-# The recipient_delimiter parameter specifies the separator between
-# user names and address extensions (user+foo). See canonical(5),
-# local(8), relocated(5) and virtual(5) for the effects this has on
-# aliases, canonical, virtual, relocated and .forward file lookups.
-# Basically, the software tries user+foo and .forward+foo before
-# trying user and .forward.
-#
-#recipient_delimiter = +
-
-# DELIVERY TO MAILBOX
-#
-# The home_mailbox parameter specifies the optional pathname of a
-# mailbox file relative to a user's home directory. The default
-# mailbox file is /var/spool/mail/user or /var/mail/user.  Specify
-# "Maildir/" for qmail-style delivery (the / is required).
-#
-#home_mailbox = Mailbox
-#home_mailbox = Maildir/
- 
-# The mail_spool_directory parameter specifies the directory where
-# UNIX-style mailboxes are kept. The default setting depends on the
-# system type.
-#
-#mail_spool_directory = /var/mail
-#mail_spool_directory = /var/spool/mail
-
-# The mailbox_command parameter specifies the optional external
-# command to use instead of mailbox delivery. The command is run as
-# the recipient with proper HOME, SHELL and LOGNAME environment settings.
-# Exception:  delivery for root is done as $default_user.
-#
-# Other environment variables of interest: USER (recipient username),
-# EXTENSION (address extension), DOMAIN (domain part of address),
-# and LOCAL (the address localpart).
-#
-# Unlike other Postfix configuration parameters, the mailbox_command
-# parameter is not subjected to $parameter substitutions. This is to
-# make it easier to specify shell syntax (see example below).
-#
-# Avoid shell meta characters because they will force Postfix to run
-# an expensive shell process. Procmail alone is expensive enough.
-#
-# IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
-# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
-#
-#mailbox_command = /some/where/procmail
-#mailbox_command = /some/where/procmail -a "$EXTENSION"
-
-# The mailbox_transport specifies the optional transport in master.cf
-# to use after processing aliases and .forward files. This parameter
-# has precedence over the mailbox_command, fallback_transport and
-# luser_relay parameters.
-#
-# Specify a string of the form transport:nexthop, where transport is
-# the name of a mail delivery transport defined in master.cf.  The
-# :nexthop part is optional. For more details see the sample transport
-# configuration file.
-#
-# NOTE: if you use this feature for accounts not in the UNIX password
-# file, then you must update the "local_recipient_maps" setting in
-# the main.cf file, otherwise the SMTP server will reject mail for    
-# non-UNIX accounts with "User unknown in local recipient table".
-#
-#mailbox_transport = lmtp:unix:/file/name
-#mailbox_transport = cyrus
-
-# The fallback_transport specifies the optional transport in master.cf
-# to use for recipients that are not found in the UNIX passwd database.
-# This parameter has precedence over the luser_relay parameter.
-#
-# Specify a string of the form transport:nexthop, where transport is
-# the name of a mail delivery transport defined in master.cf.  The
-# :nexthop part is optional. For more details see the sample transport
-# configuration file.
-#
-# NOTE: if you use this feature for accounts not in the UNIX password
-# file, then you must update the "local_recipient_maps" setting in
-# the main.cf file, otherwise the SMTP server will reject mail for    
-# non-UNIX accounts with "User unknown in local recipient table".
-#
-#fallback_transport = lmtp:unix:/file/name
-#fallback_transport = cyrus
-#fallback_transport =
-
-# The luser_relay parameter specifies an optional destination address
-# for unknown recipients.  By default, mail for unknown@$mydestination,
-# unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned
-# as undeliverable.
-#
-# The following expansions are done on luser_relay: $user (recipient
-# username), $shell (recipient shell), $home (recipient home directory),
-# $recipient (full recipient address), $extension (recipient address
-# extension), $domain (recipient domain), $local (entire recipient
-# localpart), $recipient_delimiter. Specify ${name?value} or
-# ${name:value} to expand value only when $name does (does not) exist.
-#
-# luser_relay works only for the default Postfix local delivery agent.
-#
-# NOTE: if you use this feature for accounts not in the UNIX password
-# file, then you must specify "local_recipient_maps =" (i.e. empty) in
-# the main.cf file, otherwise the SMTP server will reject mail for    
-# non-UNIX accounts with "User unknown in local recipient table".
-#
-#luser_relay = $user@other.host
-#luser_relay = $local@other.host
-#luser_relay = admin+$local
-  
-# JUNK MAIL CONTROLS
-# 
-# The controls listed here are only a very small subset. The file
-# SMTPD_ACCESS_README provides an overview.
-
-# The header_checks parameter specifies an optional table with patterns
-# that each logical message header is matched against, including
-# headers that span multiple physical lines.
-#
-# By default, these patterns also apply to MIME headers and to the
-# headers of attached messages. With older Postfix versions, MIME and
-# attached message headers were treated as body text.
-#
-# For details, see "man header_checks".
-#
-#header_checks = regexp:/etc/postfix/header_checks
-
-# FAST ETRN SERVICE
-#
-# Postfix maintains per-destination logfiles with information about
-# deferred mail, so that mail can be flushed quickly with the SMTP
-# "ETRN domain.tld" command, or by executing "sendmail -qRdomain.tld".
-# See the ETRN_README document for a detailed description.
-# 
-# The fast_flush_domains parameter controls what destinations are
-# eligible for this service. By default, they are all domains that
-# this server is willing to relay mail to.
-# 
-#fast_flush_domains = $relay_domains
-
-# SHOW SOFTWARE VERSION OR NOT
-#
-# The smtpd_banner parameter specifies the text that follows the 220
-# code in the SMTP server's greeting banner. Some people like to see
-# the mail version advertised. By default, Postfix shows no version.
-#
-# You MUST specify $myhostname at the start of the text. That is an
-# RFC requirement. Postfix itself does not care.
-#
-#smtpd_banner = $myhostname ESMTP $mail_name
-#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
-smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (Mandrakelinux)
-
-# PARALLEL DELIVERY TO THE SAME DESTINATION
-#
-# How many parallel deliveries to the same user or domain? With local
-# delivery, it does not make sense to do massively parallel delivery
-# to the same user, because mailbox updates must happen sequentially,
-# and expensive pipelines in .forward files can cause disasters when
-# too many are run at the same time. With SMTP deliveries, 10
-# simultaneous connections to the same domain could be sufficient to
-# raise eyebrows.
-# 
-# Each message delivery transport has its XXX_destination_concurrency_limit
-# parameter.  The default is $default_destination_concurrency_limit for
-# most delivery transports. For the local delivery agent the default is 2.
-
-#local_destination_concurrency_limit = 2
-#default_destination_concurrency_limit = 20
-
-# DEBUGGING CONTROL
-#
-# The debug_peer_level parameter specifies the increment in verbose
-# logging level when an SMTP client or server host name or address
-# matches a pattern in the debug_peer_list parameter.
-#
-debug_peer_level = 2
-
-# The debug_peer_list parameter specifies an optional list of domain
-# or network patterns, /file/name patterns or type:name tables. When
-# an SMTP client or server host name or address matches a pattern,
-# increase the verbose logging level by the amount specified in the
-# debug_peer_level parameter.
-#
-#debug_peer_list = 127.0.0.1
-#debug_peer_list = some.domain
-
-# The debugger_command specifies the external command that is executed
-# when a Postfix daemon program is run with the -D option.
-#
-# Use "command .. & sleep 5" so that the debugger can attach before
-# the process marches on. If you use an X-based debugger, be sure to
-# set up your XAUTHORITY environment variable before starting Postfix.
-#
-debugger_command =
-	 PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
-	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
-
-# If you don't have X installed on the Postfix machine, try:
-# debugger_command =
-#	PATH=/bin:/usr/bin:/usr/local/bin; export PATH; (echo cont;
-#	echo where) | gdb $daemon_directory/$process_name $process_id 2>&1
-#	>$config_directory/$process_name.$process_id.log & sleep 5
-
-# OTHER OPTIONS (Mandrakelinux)
-# The delay_warning_time specifies after how many hours a warning
-# is sent that mail has not yet been delivered. By default, no warning
-# is sent.
-#
-delay_warning_time = 4
-
-# INSTALL-TIME CONFIGURATION INFORMATION
-#
-# The following parameters are used when installing a new Postfix version.
-# 
-# sendmail_path: The full pathname of the Postfix sendmail command.
-# This is the Sendmail-compatible mail posting interface.
-# 
-sendmail_path = /usr/sbin/sendmail.postfix
-
-# newaliases_path: The full pathname of the Postfix newaliases command.
-# This is the Sendmail-compatible command to build alias databases.
-#
-newaliases_path = /usr/bin/newaliases.postfix
-
-# mailq_path: The full pathname of the Postfix mailq command.  This
-# is the Sendmail-compatible mail queue listing command.
-# 
-mailq_path = /usr/bin/mailq.postfix
-
-# setgid_group: The group for mail submission and queue management
-# commands.  This must be a group name with a numerical group ID that
-# is not shared with other accounts, not even with the Postfix account.
-#
-setgid_group = postdrop
-
-# html_directory: The location of the Postfix HTML documentation.
-#
-html_directory = /usr/share/doc/postfix-2.1.5/html
-
-# manpage_directory: The location of the Postfix on-line manual pages.
-#
-manpage_directory = /usr/share/man
-
-# sample_directory: The location of the Postfix sample configuration files.
-# This parameter is obsolete as of Postfix 2.1.
-#
-sample_directory = /usr/share/doc/postfix-2.1.5/samples
-
-# readme_directory: The location of the Postfix README files.
-#
-readme_directory = /usr/share/doc/postfix-2.1.5/README_FILES
diff --git a/postfix_wizard/scripts/postfix_do_it.sh b/postfix_wizard/scripts/postfix_do_it.sh
deleted file mode 100755
index 1fbaffd9..00000000
--- a/postfix_wizard/scripts/postfix_do_it.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-# 
-# Wizard
-#
-# Copyright (C) 2000 Mandrakesoft.
-# 
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# See file LICENSE for further informations on licensing terms.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-# 
-# Authors: Jerome Dumonteil, Maurizio De Cecco, Enzo Maggi
-# icons: Helene Durosini <ln@mandrakesoft.com>
-# <corporate@mandrakesoft.com> http://www.mandrakesoft.com
-
-# script for wizard network configuration
-#
-# install default postfix configuration for server
-# assuming all dependencies are ok
-
-
-echo_debug "now applying configuration for postfix"
-
-[ -d /etc/postfix ] || exit 1
-
-# first loading values
-. /etc/sysconfig/network
-
-# loading values from /etc/sysconfig/mdk_serv
-# wiz_host_name and wiz_domain_name
-wiz_host_name=`get_var wiz_host_name`
-wiz_domain_name=`get_var wiz_domain_name`
-
-wiz_device=`get_var wiz_device`
-
-
-file="/etc/sysconfig/network-scripts/ifcfg-${wiz_device}"
-echo_debug "device config : ${file}"
-[ -f ${file} ] || exit 1
-. ${file}
-
-# store the wiz_mail variable
-cfg_file=/etc/sysconfig/mdk_serv
-echo_debug "wiz_mail_masquerade ${wiz_mail_masquerade}"
-chg_val ${cfg_file} wiz_ext_mail_relay "${wiz_ext_mail_relay}" s
-chg_val ${cfg_file} wiz_mail_masquerade "${wiz_mail_masquerade}" s
-
-bck_file /etc/postfix/aliases
-bck_file /etc/postfix/canonical
-bck_file /etc/postfix/main.cf
-bck_file /etc/postfix/master.cf
-bck_file /etc/postfix/virtual
-
-# now configuring
-
-postconf -e "myhostname = ${wiz_host_name}"
-postconf -e 'myorigin = $mydomain'
-postconf -e 'inet_interfaces = all'
-postconf -e 'mydestination = $myhostname, localhost.$mydomain, $mydomain'
-
-if [ -n "${wiz_ext_mail_relay}" ]; then
-  postconf -e "relayhost = ${wiz_ext_mail_relay}"
-fi
-
-postconf -e 'masquerade_domains = $mydomain'
-
-postconf -e 'alias_maps = hash:/etc/postfix/aliases'
-postconf -e 'alias_database = hash:/etc/postfix/aliases'
-
-postconf -e 'virtual_maps = hash:/etc/postfix/virtual'
-postconf -e 'canonical_maps = hash:/etc/postfix/canonical'
-
-if [ -n "${wiz_mail_masquerade}" ]; then
-	if [ ! `grep "@${wiz_domain_name} @${wiz_mail_masquerade}" /etc/postfix/canonical` ]; then 
-  echo "@${wiz_domain_name} @${wiz_mail_masquerade}" >> /etc/postfix/canonical
-  	fi
-fi
-
-echo_debug "rebuilding hash"
-
-postmap /etc/postfix/canonical
-postmap /etc/postfix/virtual
-postalias /etc/postfix/aliases
-
-postfix check
-
-echo_debug "end of postfix configuration, restarting"
-
-service postfix restart
-service xinetd restart
-
-# all is ok
-exit 10
diff --git a/postfix_wizard/scripts/testlabel.pl b/postfix_wizard/scripts/testlabel.pl
deleted file mode 100644
index c61d3cb0..00000000
--- a/postfix_wizard/scripts/testlabel.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-$toto = "tutu";
-$tata = "titi";
-
-$file = "/home/logarno/toto";
-open(CANONICAL, "< $file");
-while (<CANONICAL>) {
-    if (/\@$toto\s*\@$tata/){
-	goto NOUPDATE; 
-    }
-}
-close(CANONICAL);
-open(CANONICAL, ">> $file");
-print CANONICAL "\n\@$toto \@$tata";
- NOUPDATE:
-    close(CANONICAL);