1 files changed, 47 insertions, 13 deletions

diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm
index 6fa3ad3c..35944e89 100755
--- a/kolab_wizard/Kolab.pm
+++ b/kolab_wizard/Kolab.pm
@@ -33,26 +33,47 @@ my $o = {
 	    ip1 => '',
 	    ip2 => ''
 	},
-	needed_packages => [],
+	needed_packages => [ 'kolab-server' ],
 	defaultimage => $ENV{__WIZ_HOME__},
     };
 
 $o->{pages} = { 
 		  welcome => {
-		      name => "\n\n" . "\n\n",
+		      name => "Welcome to the Kolab Groupware server configuration Wizard\n\n" . "\n\n",
 		  no_back => 1,
-	          next => 'config'
+	          next => 'hostname'
 	      },
-	      confige => {
-	          name => "\n\n" . "\n\n",
+	      hostname => {
+	          name => "Hostname\n\n" . "\n\n",
                   pre => sub {
-			$o->{var}{ip1} ||= f1();
-			$o->{var}{ip2} ||= f2();
+			$o->{var}{hostname} ||= f1();
 		  },
-		  post => \&check,
+		  post => \&check_not_empty,
                   data => [
-		      { label => '', val => \$o->{var}{ip1} },
-		      { label => '', val => \$o->{var}{ip2} },
+		      { label => 'Hostname', val => \$o->{var}{ip1} },
+		      ],
+	          next => 'maildomain'
+	      },
+	      maildomain => {
+	          name => "Mail domain\n\n" . "\n\n",
+                  pre => sub {
+			$o->{var}{maildomain} ||= f1();
+		  },
+		  post => \&check_not_empty,
+                  data => [
+		      { label => 'Mail domain', val => \$o->{var}{ip1} },
+		      ],
+	          next => 'password'
+	      },
+	      password => {
+	          name => "Password\n\n" . "\n\n",
+                  pre => sub {
+			$o->{var}{password} ||= '';
+		  },
+		  post => \&check_password,
+                  data => [
+		      { label => 'Password', val => \$o->{var}{password} },
+		      { label => 'Password again', val => \$o->{var}{password2} },
 		      ],
 	          next => 'summary'
 	      },
@@ -67,15 +88,15 @@ $o->{pages} = {
 	      summary => {
 	        name =>  "\n\n" . "\n\n",
                 data => [
-		      { label => '', fixed_val => \$o->{var}{ip1} },
+		      { label => 'Hostname', fixed_val => \$o->{var}{hostname} },
 		      { label => '' },
-		      { label => '', fixed_val => \$o->{var}{ip2} },
+		      { label => 'Mail domain', fixed_val => \$o->{var}{maildomain} },
 		  ],
 		post => \&do_it,
 	        next => 'end'
 	      },
 	      end => { 
-	        name => N("Congratulations") . "\n\n",
+	        name => N("Congratulations") . "\n\n" . "The kolab server is now configured and running. Log in as 'manager' with the password you entered.",
 		end => 1,
 	        next => 0
 	  },
@@ -88,4 +109,17 @@ sub new {
        }, $class;
 }
 
+sub check_password {
+
+}
+
+sub check_not_empty {
+
+}
+
+sub do_it {
+    $::testing or return;
+
+}
+
 1;