various fix and update to get it working

1 files changed, 18 insertions, 15 deletions

diff --git a/kolab_wizard/Kolab.pm b/kolab_wizard/Kolab.pm
index 4572dbc5..f512966d 100755
--- a/kolab_wizard/Kolab.pm
+++ b/kolab_wizard/Kolab.pm
@@ -52,13 +52,13 @@ my $o = {
 		 keypasswd => '',
 		},
 	 needed_rpm => [ 'proftpd', 'openldap-servers', 'kolab' ],
-	 #	 defaultimage => $ENV{__WIZ_HOME__},
+	 #	 defaultimage => /usr/share/wizards/,
 	};
 $::Wizard_pix_up = "/usr/share/mcc/themes/default/kolab-mdk.png";
 
 my %type = (
 	    1 => N("Master kolab server"),
-	    2 => N("Slave kolab server"),
+#	    2 => N("Slave kolab server"),
 	   );
 
 $o->{pages} = {
@@ -81,7 +81,6 @@ $o->{pages} = {
                            data => [
 				    { label => "", val => \$o->{var}{wiz_type}, type => 'list', list => [ sort keys %type ], format => sub { $type{$_[0]} } },
                                    ],
-			   next => '',
 			  },
 	        master => {
 			   name => N("You choose a Master Kolab server"),
@@ -93,6 +92,7 @@ $o->{pages} = {
 					{ label => N("Slave kolab server:"), val => \$o->{var}{slaveserver} },
 				       ],
 			       next => 'domain',
+			       no_back => 1,
 			      },
 	       domain => {
 			  name => N("Kolab Domain") . "\n\n" . N("Please enter your Maildomain - if you do not know your mail domain use the FQDN from above. Kolab primary email addresses will be of the type user\@yourdomain"),
@@ -144,7 +144,7 @@ $o->{pages} = {
 				return 1;
 			      } else { return 0 }
 			    },
-			    next => 'cayesorno',
+			    next => 'summary',
 			   },
 	       cayesorno => {
 			      name => N("Kolab can create and manage a certificate authority that can be used to create SSL certificates for use within the Kolab environment.") . "\n\n" . N("You can choose to skip this section if you already have certificates for the Kolab server.CA and certificate"),
@@ -165,7 +165,7 @@ $o->{pages} = {
 				      ],
 			     },
 	       capassword => {
-			      name => N("Enter the passphrase for CA, and the passphrase for the RSA key."),
+			      name => N("Kolab can create and manage a certificate authority that can be used to create SSL certificates for use within the \Kolab environment. Enter the passphrase for CA, and the passphrase for the RSA key."),
 			      complete => sub {
 				if ($o->{var}{capasswd} ne $o->{var}{capasswd2} || $o->{var}{capasswd} eq "") {
 				  $::in->ask_warn(N("Error:"), N("Password mismatch, or null password, please correct."));
@@ -216,7 +216,7 @@ $o->{pages} = {
 			   next => 'end',
 			       },
 	       end => {
-		       name => N("Congratulations") . "\n\n" . N("The kolab server is now configured and running. Log in as 'manager' with the password you entered at https://127.0.0.1/kolab/admin/"),
+		       name => N("Done") . "\n\n" . N("The kolab server is now configured. Log in as 'manager' with the password you entered at https://127.0.0.1/kolab/admin/"),
 		       end => 1,
 		       next => 0,
 		      },
@@ -238,12 +238,20 @@ sub do_it_master_withoutca {
 
 sub do_it_master {
   return if $::testing;
+  MDK::Wizard::Wizcommon_gtk2::gtk_log("service kolab stop", "");
   my $in = 'interactive'->vnew('su', 'Kolab server');
   my $w = $in->wait_message(N("Kolab server"), N("Configuring Kolab server on your system..."));
-  system("service kolab stop");
 
-#  my $command = "/usr/sbin/kolab_bootstrap -b";
-#  MDK::Wizard::Wizcommon_gtk2::wizard_progress_bar($command, "config en cours");
+  system("rm -rf /etc/kolab/*.pem");
+  system("rm -rf /etc/kolab/*.kolabtmp");
+  system("rm -rf /etc/kolab/ca/*");
+
+  substInFile {
+      s|\$REQ -new -x509 -keyout \${CATOP}/private/\$CAKEY.*|\$REQ -new -x509 -keyout \${CATOP}/private/\$CAKEY -passout pass\:\$PASSKOLAB \\|;
+      s|\$CA -policy policy_anything.*|\$CA -policy policy_anything -batch -out \${outfile} -passin pass\:\$PASSKOLAB -infiles \${infile}|;
+  } "/etc/kolab/kolab_ca.sh";
+
+  $ENV{PASSKOLAB} = $o->{var}{password};
 
   my $F;
   open($F, "|/usr/sbin/kolab_bootstrap -b\n");
@@ -258,15 +266,10 @@ $o->{var}{wiz_organame}
 $o->{var}{wiz_orgaunit}
 
 y
-y
 ";
   close $F;
-
- # system("service kolab restart");
   undef $w;
+  MDK::Wizard::Wizcommon_gtk2::gtk_log("service kolab start", "");
 }
 
-#$o->{var}{capasswd}
-#$o->{var}{capasswd2}
-#$o->{var}{keycapasswd}
 1;