some more adapting to current emailadmin: sieve host is not yet used, but defaulting to NULL is what emailadmin does too

This commit is contained in:
Ralf Becker 2010-08-20 11:15:59 +00:00
parent ebc83beb06
commit 19a25d392d

View File

@ -151,7 +151,7 @@ class setup_cmd_config extends setup_cmd
array('name' => 'imapEnableCyrusAdmin','default' => 'yes'), array('name' => 'imapEnableCyrusAdmin','default' => 'yes'),
), ),
'--sieve' => array( '--sieve' => array(
array('name' => 'imapSieveServer','default' => 'localhost'), array('name' => 'imapSieveServer'),
array('name' => 'imapSievePort','default' => 2000), array('name' => 'imapSievePort','default' => 2000),
array('name' => 'imapEnableSieve','default' => 'yes'), // null or yes array('name' => 'imapEnableSieve','default' => 'yes'), // null or yes
), ),
@ -365,8 +365,8 @@ class setup_cmd_config extends setup_cmd
$defaults['mail_suffix'] = '$domain'; $defaults['mail_suffix'] = '$domain';
$defaults['imapAdminUsername'] = 'cyrus@$domain'; $defaults['imapAdminUsername'] = 'cyrus@$domain';
$defaults['imapAdminPW'] = self::randomstring(); $defaults['imapAdminPW'] = self::randomstring();
$defaults['imapType'] = 2; // standard IMAP $defaults['imapType'] = 'defaultimap'; // standard IMAP
$defaults['smtpType'] = 1; // standard SMTP $defaults['smtpType'] = 'defaultsmtp'; // standard SMTP
return $defaults; return $defaults;
} }