Merge pull request #212 from junkpad92/master

Fixing deprecated Postfix templates & Providing Dovecot2 Sieve-Configs
This commit is contained in:
Dessa
2015-01-27 17:52:36 +01:00
70 changed files with 318 additions and 190 deletions

View File

@@ -34,9 +34,11 @@ userdb {
plugin {
# put your plugins here
# Sieve-Configuration
sieve = ~/sieve/.dovecot.sieve
sieve_dir = ~/sieve
}
@@ -115,9 +117,6 @@ service managesieve-login {
protocol sieve {
# not implemented yet
}
@@ -136,7 +135,7 @@ protocol imap {
protocol lmtp {
mail_plugins = $mail_plugins
mail_plugins = $mail_plugins sieve
postmaster_address = postmaster@<SERVERNAME>
}

View File

@@ -1,8 +1,5 @@
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
dbname = <SQL_DB>
table = mail_virtual
select_field = destination
where_field = email
additional_conditions = and TRIM(destination) <> ''
hosts = <SQL_HOST>
query = SELECT destination FROM mail_virtual WHERE email = '%s' AND TRIM(destination) <> ''

View File

@@ -1,8 +1,5 @@
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
dbname = <SQL_DB>
table = panel_domains
select_field = domain
where_field = domain
additional_conditions = and isemaildomain = '1'
hosts = <SQL_HOST>
query = SELECT domain FROM panel_domains WHERE domain = '%s' AND isemaildomain = '1'

View File

@@ -1,7 +1,5 @@
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
dbname = <SQL_DB>
table = mail_users
select_field = maildir
where_field = email
hosts = <SQL_HOST>
query = SELECT maildir FROM mail_users WHERE email = '%s'

View File

@@ -1,5 +1,5 @@
user = <SQL_UNPRIVILEGED_USER>
password = <SQL_UNPRIVILEGED_PASSWORD>
dbname = <SQL_DB>
query = select distinct username from mail_users where email in ((select mail_virtual.email_full from mail_virtual where mail_virtual.email = '%s' union select mail_virtual.destination from mail_virtual where mail_virtual.email = '%s'));
hosts = <SQL_HOST>
query = SELECT DISTINCT username FROM mail_users WHERE email in ((SELECT mail_virtual.email_full FROM mail_virtual WHERE mail_virtual.email = '%s' UNION SELECT mail_virtual.destination FROM mail_virtual WHERE mail_virtual.email = '%s'));