Les vues dovecot tiennent compte de address.enabled
This commit is contained in:
parent
2741f24fda
commit
d085129685
|
@ -663,7 +663,9 @@ concat('*:storage=',cast(`mailbox`.`quota` as char charset latin1),'M') AS `user
|
||||||
`mailbox`.`messages` AS `nb_messages`
|
`mailbox`.`messages` AS `nb_messages`
|
||||||
from ((`mailbox`
|
from ((`mailbox`
|
||||||
join `address` on((`address`.`id` = `mailbox`.`address_id`)))
|
join `address` on((`address`.`id` = `mailbox`.`address_id`)))
|
||||||
join `domaines` on((`domaines`.`id` = `address`.`domain_id`)));
|
join `domaines` on((`domaines`.`id` = `address`.`domain_id`)))
|
||||||
|
where `address`.`enabled` = 1
|
||||||
|
;
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Structure de la vue `alias_view`
|
-- Structure de la vue `alias_view`
|
||||||
|
@ -675,13 +677,13 @@ concat(if(isnull(`mailbox`.`id`),'',concat(concat(`address`.`address`,'@',`domai
|
||||||
from (((`recipient` join `address` on((`address`.`id` = `recipient`.`address_id`)))
|
from (((`recipient` join `address` on((`address`.`id` = `recipient`.`address_id`)))
|
||||||
left join `mailbox` on((`mailbox`.`address_id` = `address`.`id`)))
|
left join `mailbox` on((`mailbox`.`address_id` = `address`.`id`)))
|
||||||
join `domaines` on((`domaines`.`id` = `address`.`domain_id`)))
|
join `domaines` on((`domaines`.`id` = `address`.`domain_id`)))
|
||||||
|
where `address`.`enabled` = 1
|
||||||
union
|
union
|
||||||
select distinct concat(`m`.`login`,'@',`v`.`value`) AS `mail`,
|
select distinct concat(`m`.`login`,'@',`v`.`value`) AS `mail`,
|
||||||
`m`.`mail` AS `alias`
|
`m`.`mail` AS `alias`
|
||||||
from ((`membres` `m` join `variable` `v`) join `domaines` `d`)
|
from ((`membres` `m` join `variable` `v`) join `domaines` `d`)
|
||||||
where (`v`.`name` = 'mailname_bounce');
|
where (`v`.`name` = 'mailname_bounce');
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Structure de la table `piwik_users`
|
-- Structure de la table `piwik_users`
|
||||||
--
|
--
|
||||||
|
|
|
@ -165,6 +165,43 @@ CREATE TABLE IF NOT EXISTS `cron` (
|
||||||
KEY `uid` (`uid`)
|
KEY `uid` (`uid`)
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Structure de la vue `dovecot_view`
|
||||||
|
--
|
||||||
|
|
||||||
|
CREATE OR REPLACE VIEW `dovecot_view` AS
|
||||||
|
SELECT concat(`address`.`address`,'@',`domaines`.`domaine`) AS `user`,
|
||||||
|
concat('*:storage=',cast(`mailbox`.`quota` as char charset latin1),'M') AS `userdb_quota_rule`,
|
||||||
|
`address`.`password` AS `password`,
|
||||||
|
`mailbox`.`path` AS `userdb_home`,
|
||||||
|
`domaines`.`compte` AS `userdb_uid`,
|
||||||
|
`domaines`.`compte` AS `userdb_gid`,
|
||||||
|
`mailbox`.`bytes` AS `quota_dovecot`,
|
||||||
|
`mailbox`.`messages` AS `nb_messages`
|
||||||
|
from ((`mailbox`
|
||||||
|
join `address` on((`address`.`id` = `mailbox`.`address_id`)))
|
||||||
|
join `domaines` on((`domaines`.`id` = `address`.`domain_id`)))
|
||||||
|
where `address`.`enabled` = 1
|
||||||
|
;
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Structure de la vue `alias_view`
|
||||||
|
--
|
||||||
|
|
||||||
|
CREATE OR REPLACE VIEW `alias_view` AS
|
||||||
|
select concat(`address`.`address`,'@',`domaines`.`domaine`) AS `mail`,
|
||||||
|
concat(if(isnull(`mailbox`.`id`),'',concat(concat(`address`.`address`,'@',`domaines`.`domaine`),'\n')),`recipient`.`recipients`) AS `alias`
|
||||||
|
from (((`recipient` join `address` on((`address`.`id` = `recipient`.`address_id`)))
|
||||||
|
left join `mailbox` on((`mailbox`.`address_id` = `address`.`id`)))
|
||||||
|
join `domaines` on((`domaines`.`id` = `address`.`domain_id`)))
|
||||||
|
where `address`.`enabled` = 1
|
||||||
|
union
|
||||||
|
select distinct concat(`m`.`login`,'@',`v`.`value`) AS `mail`,
|
||||||
|
`m`.`mail` AS `alias`
|
||||||
|
from ((`membres` `m` join `variable` `v`) join `domaines` `d`)
|
||||||
|
where (`v`.`name` = 'mailname_bounce');
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Structure de la table `piwik_users`
|
-- Structure de la table `piwik_users`
|
||||||
--
|
--
|
||||||
|
|
Loading…
Reference in New Issue