From 0e2978ef48e7877ee46aa4a9e52e86b8f76c9733 Mon Sep 17 00:00:00 2001 From: Dominik Müller <info@profi-webdesign.net> Date: Sat, 18 Jan 2014 23:34:06 -0500 Subject: [PATCH] Mailbox quota can now be included into website quota (FS#3297) -------------------------------------------------------------- Feature can be activated over admin mailserver settings. when activated websites uid is used instead of standard vmail-uid. this only takes effect if web and mailserver are on the same server, otherwise it will be old behaviour. switching this setting when mailboxes exist doesn't matter. Mailboxfolder will be created with website uid for this. access of postfix and dovecot now works over mysql-table mail_user. virtual_uid_maps is changed from static to mysql-table. for dovecot<->postfix communication protocoll is changed vrom lda to lmtp. disablelmtp-column is added to mail_user-table. uid and gid can be overwritten by remoting. ONE OPEN ISSUE: since remoting has completly changed and mail_user_add function is missing at the moment, this function now was inclulded again. it is important to add the both new lines to the future function and then remove this new one. --- install/sql/incremental/upd_0060.sql | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/install/sql/incremental/upd_0060.sql b/install/sql/incremental/upd_0060.sql index d68d2bf..64c9a0d 100644 --- a/install/sql/incremental/upd_0060.sql +++ b/install/sql/incremental/upd_0060.sql @@ -1,14 +1,8 @@ -CREATE TABLE `mail_backup` ( - `backup_id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `server_id` int(10) unsigned NOT NULL, - `parent_domain_id` int(10) unsigned NOT NULL, - `mailuser_id` int(10) unsigned NOT NULL, - `backup_mode` varchar(64) NOT NULL DEFAULT '', - `tstamp` int(10) unsigned NOT NULL, - `filename` varchar(255) NOT NULL, - `filesize` VARCHAR(10) NOT NULL, - PRIMARY KEY (`backup_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; - -ALTER TABLE `mail_user` ADD `backup_interval` VARCHAR( 255 ) NOT NULL ; -ALTER TABLE `mail_user` ADD `backup_copies` INT NOT NULL DEFAULT '1'; +ALTER TABLE `client` ADD `customer_no_template` VARCHAR( 255 ) NULL DEFAULT 'C[CUSTOMER_NO]' AFTER `ssh_rsa` , +ADD `customer_no_start` INT NOT NULL DEFAULT '1' AFTER `customer_no_template` , +ADD `customer_no_counter` INT NOT NULL DEFAULT '0' AFTER `customer_no_start` , +ADD `added_date` DATE NOT NULL default '0000-00-00' AFTER `customer_no_counter` , +ADD `added_by` VARCHAR( 255 ) NULL AFTER `added_date` ; +ALTER TABLE `web_domain` ADD `added_date` DATE NOT NULL default '0000-00-00' AFTER `rewrite_rules` , +ADD `added_by` VARCHAR( 255 ) NULL AFTER `added_date` ; +ALTER TABLE `sys_session` ADD `permanent` ENUM('n','y') NOT NULL DEFAULT 'n' AFTER `last_updated`; \ No newline at end of file -- Gitblit v1.9.1