diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index 4a745f86381aa47f571c51ba85f4653f0f1136cb..efbbf06462c4c835973e7050dde5fe1c71e4cfb4 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -124,6 +124,11 @@ $conf['courier']['courier-imap-ssl'] = ''; $conf['courier']['courier-pop'] = ''; $conf['courier']['courier-pop-ssl'] = ''; +//* Dovecot +$conf['dovecot']['installed'] = false; // will be detected automatically during installation +$conf['dovecot']['config_dir'] = '/etc/dovecot'; +$conf['dovecot']['init_script'] = 'dovecot'; + //* SASL $conf['saslauthd']['installed'] = false; // will be detected automatically during installation $conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd'; diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php index 4a745f86381aa47f571c51ba85f4653f0f1136cb..efbbf06462c4c835973e7050dde5fe1c71e4cfb4 100644 --- a/install/dist/conf/centos53.conf.php +++ b/install/dist/conf/centos53.conf.php @@ -124,6 +124,11 @@ $conf['courier']['courier-imap-ssl'] = ''; $conf['courier']['courier-pop'] = ''; $conf['courier']['courier-pop-ssl'] = ''; +//* Dovecot +$conf['dovecot']['installed'] = false; // will be detected automatically during installation +$conf['dovecot']['config_dir'] = '/etc/dovecot'; +$conf['dovecot']['init_script'] = 'dovecot'; + //* SASL $conf['saslauthd']['installed'] = false; // will be detected automatically during installation $conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd'; diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index a124489f4d581d5aa5267df63c96e76e44f7fc8a..ca959bbcbd8fdebb68811c5604c1dcecf2db7c90 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -123,6 +123,11 @@ $conf['courier']['courier-imap'] = 'courier-imap'; $conf['courier']['courier-imap-ssl'] = 'courier-imap-ssl'; $conf['courier']['courier-pop'] = 'courier-pop'; $conf['courier']['courier-pop-ssl'] = 'courier-pop-ssl'; +$conf['dovecot']['init_script'] = 'dovecot'; + +//* Dovecot +$conf['dovecot']['installed'] = false; // will be detected automatically during installation +$conf['dovecot']['config_dir'] = '/etc/dovecot'; //* SASL $conf['saslauthd']['installed'] = false; // will be detected automatically during installation diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index 86693cb59ab024ed8137f9c403e2875290154eb0..6a00e673cdc0052d9e251533dcac8e1274fb7fad 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -124,6 +124,11 @@ $conf['courier']['courier-imap-ssl'] = 'courier-imap'; $conf['courier']['courier-pop'] = 'courier-imap'; $conf['courier']['courier-pop-ssl'] = 'courier-imap'; +//* Dovecot +$conf['dovecot']['installed'] = false; // will be detected automatically during installation +$conf['dovecot']['config_dir'] = '/etc/dovecot'; +$conf['dovecot']['init_script'] = 'dovecot'; + //* SASL $conf['saslauthd']['installed'] = false; // will be detected automatically during installation $conf['saslauthd']['config'] = '/etc/sysconfig/saslauthd'; diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php index 793e7e02b19c85dda75783ad423686238038fdb6..69b9ea38d6ef65db5c15b7f93390a8cbfda0da0e 100644 --- a/install/dist/conf/gentoo.conf.php +++ b/install/dist/conf/gentoo.conf.php @@ -148,6 +148,11 @@ $conf['courier']['courier-imap-ssl'] = 'courier-imapd-ssl'; $conf['courier']['courier-pop'] = 'courier-pop3d'; $conf['courier']['courier-pop-ssl'] = 'courier-pop3d-ssl'; +//* Dovecot +$conf['dovecot']['installed'] = false; // will be detected automatically during installation +$conf['dovecot']['config_dir'] = '/etc/dovecot'; +$conf['dovecot']['init_script'] = 'dovecot'; + //* SASL $conf['saslauthd']['installed'] = false; // will be detected automatically during installation $conf['saslauthd']['config_file'] = '/etc/conf.d/saslauthd'; diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index 5ebc5367ea22484f277b0a845b8c01a5c342ee58..6c5bb178c8b646d64a54eca6841d921ddc0b38ef 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -124,6 +124,11 @@ $conf['courier']['courier-imap-ssl'] = 'courier-imap-ssl'; $conf['courier']['courier-pop'] = 'courier-pop'; $conf['courier']['courier-pop-ssl'] = 'courier-pop-ssl'; +//* Dovecot +$conf['dovecot']['installed'] = false; // will be detected automatically during installation +$conf['dovecot']['config_dir'] = '/etc/dovecot'; +$conf['dovecot']['init_script'] = 'dovecot'; + //* SASL $conf['saslauthd']['installed'] = false; // will be detected automatically during installation $conf['saslauthd']['config'] = '/etc/default/saslauthd'; diff --git a/install/install.php b/install/install.php index 2e8606b3f64fca8704337e1517fc5fa63d9651b6..80fe681e2de11e91326fcdab5d4a7d8fa03edf18 100644 --- a/install/install.php +++ b/install/install.php @@ -170,10 +170,16 @@ if($install_mode == 'standard') { //* Configure PAM swriteln('Configuring PAM'); $inst->configure_pam(); - - //* Configure courier - swriteln('Configuring Courier'); - $inst->configure_courier(); + + if($conf['dovecot']['installed'] == true) { + //* Configure dovecot + swriteln('Configuring Dovecot'); + $inst->configure_dovecot(); + } else { + //* Configure courier + swriteln('Configuring Courier'); + $inst->configure_courier(); + } //* Configure Spamasassin swriteln('Configuring Spamassassin'); @@ -247,6 +253,7 @@ if($install_mode == 'standard') { if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart'); if($conf['courier']['courier-pop'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart'); if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); + if($conf['dovecot']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart'); if($conf['apache']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart'); if($conf['pureftpd']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'])) system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart'); if($conf['mydns']['installed'] == true && $conf['mydns']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['mydns']['init_script'])) system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null'); @@ -328,9 +335,15 @@ if($install_mode == 'standard') { swriteln('Configuring PAM'); $inst->configure_pam(); - //* Configure courier - swriteln('Configuring Courier'); - $inst->configure_courier(); + if($conf['dovecot']['installed'] == true) { + //* Configure dovecot + swriteln('Configuring Dovecot'); + $inst->configure_dovecot(); + } else { + //* Configure courier + swriteln('Configuring Courier'); + $inst->configure_courier(); + } //* Configure Spamasassin swriteln('Configuring Spamassassin'); @@ -353,6 +366,7 @@ if($install_mode == 'standard') { if($conf['courier']['courier-imap-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart'); if($conf['courier']['courier-pop'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart'); if($conf['courier']['courier-pop-ssl'] != '') system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); + if($conf['dovecot']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart'); } //** Configure Jailkit diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 7f5046bd97b1421a77a33760bf19f6864523ec52..6833b0893d9ffa74d071b2405a579ced7e568b6e 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -121,6 +121,7 @@ class installer_base { if(is_installed('apache') || is_installed('apache2') || is_installed('httpd')) $conf['apache']['installed'] = true; if(is_installed('getmail')) $conf['getmail']['installed'] = true; if(is_installed('couriertcpd')) $conf['courier']['installed'] = true; + if(is_installed('dovecot')) $conf['dovecot']['installed'] = true; if(is_installed('saslsauthd')) $conf['saslauthd']['installed'] = true; if(is_installed('amavisd-new')) $conf['amavis']['installed'] = true; if(is_installed('clamdscan')) $conf['clamav']['installed'] = true; @@ -215,6 +216,8 @@ class installer_base { $tpl_ini_array['web']['security_level'] = 20; $tpl_ini_array['web']['user'] = $conf['apache']['user']; $tpl_ini_array['web']['group'] = $conf['apache']['group']; + $tpl_ini_array['mail']['pop3_imap_daemon'] = ($conf['dovecot']['installed'] == true)?'dovecot':'courier'; + $tpl_ini_array['mail']['mail_filter_syntax'] = ($conf['dovecot']['installed'] == true)?'sieve':'maildrop'; $server_ini_content = array_to_ini($tpl_ini_array); $server_ini_content = mysql_real_escape_string($server_ini_content); @@ -226,6 +229,8 @@ class installer_base { $db_server_enabled = ($conf['services']['db'])?1:0; $vserver_server_enabled = ($conf['services']['vserver'])?1:0; + + if($conf['mysql']['master_slave_setup'] == 'y') { //* Insert the server record in master DB @@ -648,6 +653,72 @@ class installer_base { wf($configfile, $content); } + public function configure_dovecot() + { + global $conf; + + $config_dir = $conf['dovecot']['config_dir']; + + //* Configure master.cf and add a line for deliver + if(is_file($config_dir.'/master.cf')){ + copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); + } + if(is_file($config_dir.'/master.cf~')){ + exec('chmod 400 '.$config_dir.'/master.cf~2'); + } + $content = rf($conf["postfix"]["config_dir"].'/master.cf'); + // Only add the content if we had not addded it before + if(!stristr($content,"dovecot/deliver")) { + $deliver_content = "dovecot unix - n n - - pipe\n flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${user}@${nexthop}"; + af($conf["postfix"]["config_dir"].'/master.cf',$deliver_content); + } + unset($content); + unset($deliver_content); + + + //* Reconfigure postfix to use dovecot authentication + // Adding the amavisd commands to the postfix configuration + $postconf_commands = array ( + 'dovecot_destination_recipient_limit = 1', + 'virtual_transport = dovecot', + 'smtpd_sasl_type = dovecot', + 'smtpd_sasl_path = private/auth' + ); + + // Make a backup copy of the main.cf file + copy($conf["postfix"]["config_dir"].'/main.cf',$conf["postfix"]["config_dir"].'/main.cf~3'); + + // Executing the postconf commands + foreach($postconf_commands as $cmd) { + $command = "postconf -e '$cmd'"; + caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + } + + //* copy dovecot.conf + $configfile = 'dovecot.conf'; + if(is_file("$config_dir/$configfile")){ + copy("$config_dir/$configfile", "$config_dir/$configfile~"); + } + copy('tpl/debian_dovecot.conf.master',"$config_dir/$configfile"); + + //* dovecot-sql.conf + $configfile = 'dovecot-sql.conf'; + if(is_file("$config_dir/$configfile")){ + copy("$config_dir/$configfile", "$config_dir/$configfile~"); + } + exec("chmod 400 $config_dir/$configfile~"); + $content = rf("tpl/debian_dovecot-sql.conf.master"); + $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); + $content = str_replace('{mysql_server_ispconfig_password}',$conf['mysql']['ispconfig_password'], $content); + $content = str_replace('{mysql_server_database}',$conf['mysql']['database'],$content); + $content = str_replace('{mysql_server_host}',$conf['mysql']['host'],$content); + wf("$config_dir/$configfile", $content); + + exec("chmod 600 $config_dir/$configfile"); + exec("chown root:root $config_dir/$configfile"); + + } + public function configure_amavis() { global $conf; diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index f1a3cea10f60663e48b83099aa8e1b1b6e21a771..892a40a93a3677d4d9bd4d55f4af46c38240c2e9 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -549,8 +549,10 @@ CREATE TABLE `mail_user` ( `custom_mailfilter` mediumtext, `postfix` enum('n','y') NOT NULL, `access` enum('n','y') NOT NULL, - `disableimap` enum('0','1') NOT NULL default '0', - `disablepop3` enum('0','1') NOT NULL default '0', + `disableimap` enum('n','y') NOT NULL default 'n', + `disablepop3` enum('n','y') NOT NULL default 'n', + `disabledeliver` enum('n','y') NOT NULL default 'n', + `disablesmtp` enum('n','y') NOT NULL default 'n', PRIMARY KEY (`mailuser_id`), KEY `server_id` (`server_id`,`email`), KEY `email_access` (`email`,`access`) diff --git a/install/tpl/debian_dovecot-sql.conf.master b/install/tpl/debian_dovecot-sql.conf.master new file mode 100644 index 0000000000000000000000000000000000000000..6e51db39f50b86e538f081b52a03754f7ba879ec --- /dev/null +++ b/install/tpl/debian_dovecot-sql.conf.master @@ -0,0 +1,126 @@ +# This file is opened as root, so it should be owned by root and mode 0600. +# +# http://wiki.dovecot.org/AuthDatabase/SQL +# +# For the sql passdb module, you'll need a database with a table that +# contains fields for at least the userid and password. If you want to +# use the user@domain syntax, you might want to have a separate domain +# field as well. +# +# If your users all have the same uig/gid, and have predictable home +# directories, you can use the static userdb module to generate the home +# dir based on the userid and domain. In this case, you won't need fields +# for home, uid, or gid in the database. +# +# If you prefer to use the sql userdb module, you'll want to add fields +# for home, uid, and gid. Here is an example table: +# +# CREATE TABLE users ( +# userid VARCHAR(128) NOT NULL, +# password VARCHAR(64) NOT NULL, +# home VARCHAR(255) NOT NULL, +# uid INTEGER NOT NULL, +# gid INTEGER NOT NULL, +# active CHAR(1) DEFAULT 'Y' NOT NULL +# ); + +# Database driver: mysql, pgsql, sqlite +#driver = + +# Database connection string. This is driver-specific setting. +# +# pgsql: +# For available options, see the PostgreSQL documention for the +# PQconnectdb function of libpq. +# +# mysql: +# Basic options emulate PostgreSQL option names: +# host, port, user, password, dbname +# +# But also adds some new settings: +# client_flags - See MySQL manual +# ssl_ca, ssl_ca_path - Set either one or both to enable SSL +# ssl_cert, ssl_key - For sending client-side certificates to server +# ssl_cipher - Set minimum allowed cipher security (default: HIGH) +# +# You can connect to UNIX sockets by using host: host=/var/run/mysqld/mysqld.sock +# Note that currently you can't use spaces in parameters. +# +# sqlite: +# The path to the database file. +# +# Examples: +# connect = host=192.168.1.1 dbname=users +# connect = host=sql.example.com dbname=virtual user=virtual password=blarg +# connect = /etc/dovecot/authdb.sqlite +# +#connect = dbname=virtual user=virtual + +# Default password scheme. +# +# List of supported schemes is in +# http://wiki.dovecot.org/Authentication/PasswordSchemes +# +#default_pass_scheme = PLAIN-MD5 + +# Query to retrieve the password. +# +# This query must return only one row with "user" and "password" columns. +# The query can also return other fields which have a special meaning, see +# http://wiki.dovecot.org/PasswordDatabase/ExtraFields +# +# The "user" column is needed to make sure the username gets used with exactly +# the same casing as it's in the database. Note that if you store username and +# domain in separate fields, you most likely want to return a combination of +# them as the "user" column, otherwise the domain gets stripped. +# +# Commonly used available substitutions (see +# http://wiki.dovecot.org/Variables for full list): +# %u = entire userid +# %n = user part of user@domain +# %d = domain part of user@domain +# +# Note that these can be used only as input to SQL query. If the query outputs +# any of these substitutions, they're not touched. Otherwise it would be +# difficult to have eg. usernames containing '%' characters. +# +# Example: +# password_query = SELECT concat(userid, '@', domain) AS user, password FROM users WHERE userid = '%n' AND domain = '%d' +# password_query = SELECT pw AS password FROM users WHERE userid = '%u' AND active = 'Y' +# +#password_query = SELECT userid as user, password FROM users WHERE userid = '%u' + +# Query to retrieve the user information. +# +# The query must return only one row. Commonly returned columns are: +# uid - System UID +# gid - System GID +# home - Home directory +# mail - Mail location +# +# Either home or mail is required. uid and gid are required. If more than one +# row is returned or there are missing fields, the login will fail. For a list +# of all fields that can be returned, see +# http://wiki.dovecot.org/UserDatabase/ExtraFields +# +# Examples +# user_query = SELECT home, uid, gid FROM users WHERE userid = '%n' AND domain = '%d' +# user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u' +# user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u' +# +#user_query = SELECT home, uid, gid FROM users WHERE userid = '%u' + +# If you wish to avoid two SQL lookups (passdb + userdb), you can use +# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll +# also have to return userdb fields in password_query prefixed with "userdb_" +# string. For example: +#password_query = SELECT userid as user, password, home as userdb_home, uid as userdb_uid, gid as userdb_gid FROM users WHERE userid = '%u' + +driver = mysql +connect = host={mysql_server_host} dbname={mysql_server_database} user={mysql_server_ispconfig_user} password={mysql_server_ispconfig_password} +default_pass_scheme = CRYPT + +password_query = SELECT password FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' +user_query = SELECT email as user, maildir as home, CONCAT(maildir, '/Maildir') as mail, uid, gid, CONCAT('maildir:storage=', quota) AS quota, CONCAT(maildir, '/.sieve') as sieve FROM mail_user WHERE email = '%u' AND disable%Ls = 'n' + + diff --git a/install/tpl/debian_dovecot.conf.master b/install/tpl/debian_dovecot.conf.master new file mode 100644 index 0000000000000000000000000000000000000000..d25798200388efc46777dee1f1d78e861d85ce00 --- /dev/null +++ b/install/tpl/debian_dovecot.conf.master @@ -0,0 +1,1143 @@ +## Dovecot configuration file + +# If you're in a hurry, see http://wiki.dovecot.org/QuickConfiguration + +# "dovecot -n" command gives a clean output of the changed settings. Use it +# instead of copy&pasting this file when posting to the Dovecot mailing list. + +# '#' character and everything after it is treated as comments. Extra spaces +# and tabs are ignored. If you want to use either of these explicitly, put the +# value inside quotes, eg.: key = "# char and trailing whitespace " + +# Default values are shown for each setting, it's not required to uncomment +# any of the lines. Exception to this are paths, they're just examples with +# the real defaults being based on configure options. The paths listed here +# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +# --with-ssldir=/etc/ssl + +# Base directory where to store runtime data. +#base_dir = /var/run/dovecot/ + +# Protocols we want to be serving: imap imaps pop3 pop3s managesieve +# If you only want to use dovecot-auth, you can set this to "none". +#protocols = imap imaps +protocols = imap imaps pop3 pop3s + +# IP or host address where to listen in for connections. It's not currently +# possible to specify multiple addresses. "*" listens in all IPv4 interfaces. +# "[::]" listens in all IPv6 interfaces, but may also listen in all IPv4 +# interfaces depending on the operating system. +# +# If you want to specify ports for each service, you will need to configure +# these settings inside the protocol imap/pop3/managesieve { ... } section, +# so you can specify different ports for IMAP/POP3/MANAGESIEVE. For example: +# protocol imap { +# listen = *:10143 +# ssl_listen = *:10943 +# .. +# } +# protocol pop3 { +# listen = *:10100 +# .. +# } +# protocol managesieve { +# listen = *:12000 +# .. +# } +#listen = * + +# Disable LOGIN command and all other plaintext authentications unless +# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP +# matches the local IP (ie. you're connecting from the same computer), the +# connection is considered secure and plaintext authentication is allowed. +disable_plaintext_auth = no + +# Should all IMAP and POP3 processes be killed when Dovecot master process +# shuts down. Setting this to "no" means that Dovecot can be upgraded without +# forcing existing client connections to close (although that could also be +# a problem if the upgrade is eg. because of a security fix). This however +# means that after master process has died, the client processes can't write +# to log files anymore. +#shutdown_clients = yes + +## +## Logging +## + +# Log file to use for error messages, instead of sending them to syslog. +# /dev/stderr can be used to log into stderr. +#log_path = + +# Log file to use for informational and debug messages. +# Default is the same as log_path. +#info_log_path = + +# Prefix for each line written to log file. % codes are in strftime(3) +# format. +#log_timestamp = "%b %d %H:%M:%S " +log_timestamp = "%Y-%m-%d %H:%M:%S " + +# Syslog facility to use if you're logging to syslog. Usually if you don't +# want to use "mail", you'll use local0..local7. Also other standard +# facilities are supported. +#syslog_facility = mail + +## +## SSL settings +## + +# IP or host address where to listen in for SSL connections. Defaults +# to above if not specified. +#ssl_listen = + +# Disable SSL/TLS support. +#ssl_disable = no + +# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before +# dropping root privileges, so keep the key file unreadable by anyone but +# root. +#ssl_cert_file = /etc/ssl/certs/dovecot.pem +#ssl_key_file = /etc/ssl/private/dovecot.pem + +# If key file is password protected, give the password here. Alternatively +# give it when starting dovecot with -p parameter. +#ssl_key_password = + +# File containing trusted SSL certificate authorities. Set this only if you +# intend to use ssl_verify_client_cert=yes. The CAfile should contain the +# CA-certificate(s) followed by the matching CRL(s). +#ssl_ca_file = + +# Request client to send a certificate. If you also want to require it, set +# ssl_require_client_cert=yes in auth section. +#ssl_verify_client_cert = no + +# How often to regenerate the SSL parameters file. Generation is quite CPU +# intensive operation. The value is in hours, 0 disables regeneration +# entirely. +#ssl_parameters_regenerate = 168 + +# SSL ciphers to use +#ssl_cipher_list = ALL:!LOW + +# Show protocol level SSL errors. +#verbose_ssl = no + +## +## Login processes +## + +# + +# Directory where authentication process places authentication UNIX sockets +# which login needs to be able to connect to. The sockets are created when +# running as root, so you don't have to worry about permissions. Note that +# everything in this directory is deleted when Dovecot is started. +#login_dir = /var/run/dovecot/login + +# chroot login process to the login_dir. Only reason not to do this is if you +# wish to run the whole Dovecot without roots. +#login_chroot = yes + +# User to use for the login process. Create a completely new user for this, +# and don't use it anywhere else. The user must also belong to a group where +# only it has access, it's used to control access for authentication process. +# Note that this user is NOT used to access mails. +#login_user = dovecot + +# Set max. process size in megabytes. If you don't use +# login_process_per_connection you might need to grow this. +#login_process_size = 64 + +# Should each login be processed in it's own process (yes), or should one +# login process be allowed to process multiple connections (no)? Yes is more +# secure, espcially with SSL/TLS enabled. No is faster since there's no need +# to create processes all the time. +#login_process_per_connection = yes + +# Number of login processes to keep for listening new connections. +#login_processes_count = 3 + +# Maximum number of login processes to create. The listening process count +# usually stays at login_processes_count, but when multiple users start logging +# in at the same time more extra processes are created. To prevent fork-bombing +# we check only once in a second if new processes should be created - if all +# of them are used at the time, we double their amount until the limit set by +# this setting is reached. +#login_max_processes_count = 128 + +# Maximum number of connections allowed per each login process. This setting +# is used only if login_process_per_connection=no. Once the limit is reached, +# the process notifies master so that it can create a new login process. +# You should make sure that the process has at least +# 16 + login_max_connections * 2 available file descriptors. +#login_max_connections = 256 + +# Greeting message for clients. +#login_greeting = Dovecot ready. + +# Space-separated list of elements we want to log. The elements which have +# a non-empty variable value are joined together to form a comma-separated +# string. +#login_log_format_elements = user=<%u> method=%m rip=%r lip=%l %c + +# Login log format. %$ contains login_log_format_elements string, %s contains +# the data we want to log. +#login_log_format = %$: %s + +## +## Mailbox locations and namespaces +## + +# Location for users' mailboxes. This is the same as the old default_mail_env +# setting. The default is empty, which means that Dovecot tries to find the +# mailboxes automatically. This won't work if the user doesn't have any mail +# yet, so you should explicitly tell Dovecot the full location. +# +# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u) +# isn't enough. You'll also need to tell Dovecot where the other mailboxes are +# kept. This is called the "root mail directory", and it must be the first +# path given in the mail_location setting. +# +# There are a few special variables you can use, eg.: +# +# %u - username +# %n - user part in user@domain, same as %u if there's no domain +# %d - domain part in user@domain, empty if there's no domain +# %h - home directory +# +# See /usr/share/doc/dovecot-common/wiki/Variables.txt for full list. Some +# examples: +# +# mail_location = maildir:~/Maildir +# mail_location = mbox:~/mail:INBOX=/var/mail/%u +# mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n +# +# +# +#mail_location = + +# If you need to set multiple mailbox locations or want to change default +# namespace settings, you can do it by defining namespace sections. +# NOTE: Namespaces currently work ONLY with IMAP! POP3 and LDA currently ignore +# namespaces completely, they use only the mail_location setting. +# +# You can have private, shared and public namespaces. The only difference +# between them is how Dovecot announces them to client via NAMESPACE +# extension. Shared namespaces are meant for user-owned mailboxes which are +# shared to other users, while public namespaces are for more globally +# accessible mailboxes. +# +# REMEMBER: If you add any namespaces, the default namespace must be added +# explicitly, ie. mail_location does nothing unless you have a namespace +# without a location setting. Default namespace is simply done by having a +# namespace with empty prefix. +#namespace private { + # Hierarchy separator to use. You should use the same separator for all + # namespaces or some clients get confused. '/' is usually a good one. + # The default however depends on the underlying mail storage format. + #separator = + + # Prefix required to access this namespace. This needs to be different for + # all namespaces. For example "Public/". + #prefix = + + # Physical location of the mailbox. This is in same format as + # mail_location, which is also the default for it. + #location = + + # There can be only one INBOX, and this setting defines which namespace + # has it. + #inbox = yes + + # If namespace is hidden, it's not advertised to clients via NAMESPACE + # extension or shown in LIST replies. This is mostly useful when converting + # from another server with different namespaces which you want to depricate + # but still keep working. For example you can create hidden namespaces with + # prefixes "~/mail/", "~%u/mail/" and "mail/". + #hidden = yes +#} + +# Group to enable temporarily for privileged operations. Currently this is +# used only with INBOX when either its initial creation or dotlocking fails. +# Typically this is set to "mail" to give access to /var/mail. +mail_privileged_group = mail + +# Grant access to these supplementary groups for mail processes. Typically +# these are used to set up access to shared mailboxes. Note that it may be +# dangerous to set these if users can create symlinks (e.g. if "mail" group is +# set here, ln -s /var/mail ~/mail/var could allow a user to delete others' +# mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it). +#mail_access_groups = + +# Allow full filesystem access to clients. There's no access checks other than +# what the operating system does for the active UID/GID. It works with both +# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/ +# or ~user/. +#mail_full_filesystem_access = no + +## +## Mail processes +## + +# Enable mail process debugging. This can help you figure out why Dovecot +# isn't finding your mails. +#mail_debug = no + +# Log prefix for mail processes. +# See /usr/share/doc/dovecot-common/wiki/Variables.txt for list of possible +# variables you can use. +#mail_log_prefix = "%Us(%u): " + +# Max. number of lines a mail process is allowed to log per second before it's +# throttled. 0 means unlimited. Typically there's no need to change this +# unless you're using mail_log plugin, which may log a lot. +#mail_log_max_lines_per_sec = 10 + +# Don't use mmap() at all. This is required if you store indexes to shared +# filesystems (NFS or clustered filesystem). +#mmap_disable = no + +# Don't write() to mmaped files. This is required for some operating systems +# which use separate caches for them, such as OpenBSD. +#mmap_no_write = no + +# Rely on O_EXCL to work when creating dotlock files. The default is to use +# hard linking. O_EXCL makes the dotlocking faster, but it doesn't always +# work with NFS. +#dotlock_use_excl = no + +# Don't use fsync() or fdatasync() calls. This makes the performance better +# at the cost of potential data loss if the server (or the file server) +# goes down. +#fsync_disable = no + +# Locking method for index files. Alternatives are fcntl, flock and dotlock. +# Dotlocking uses some tricks which may create more disk I/O than other locking +# methods. NFS users: flock doesn't work, remember to change mmap_disable. +#lock_method = fcntl + +# Drop all privileges before exec()ing the mail process. This is mostly +# meant for debugging, otherwise you don't get core dumps. It could be a small +# security risk if you use single UID for multiple users, as the users could +# ptrace() each others processes then. +#mail_drop_priv_before_exec = no + +# Show more verbose process titles (in ps). Currently shows user name and +# IP address. Useful for seeing who are actually using the IMAP processes +# (eg. shared mailboxes or if same uid is used for multiple accounts). +#verbose_proctitle = no + +# Valid UID range for users, defaults to 500 and above. This is mostly +# to make sure that users can't log in as daemons or other system users. +# Note that denying root logins is hardcoded to dovecot binary and can't +# be done even if first_valid_uid is set to 0. +#first_valid_uid = 500 +#last_valid_uid = 0 + +# Valid GID range for users, defaults to non-root/wheel. Users having +# non-valid GID as primary group ID aren't allowed to log in. If user +# belongs to supplementary groups with non-valid GIDs, those groups are +# not set. +#first_valid_gid = 1 +#last_valid_gid = 0 + +# Maximum number of running mail processes. When this limit is reached, +# new users aren't allowed to log in. +#max_mail_processes = 1024 + +# Set max. process size in megabytes. Most of the memory goes to mmap()ing +# files, so it shouldn't harm much even if this limit is set pretty high. +#mail_process_size = 256 + +# Maximum allowed length for mail keyword name. It's only forced when trying +# to create new keywords. +#mail_max_keyword_length = 50 + +# ':' separated list of directories under which chrooting is allowed for mail +# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too). +# This setting doesn't affect login_chroot or auth chroot variables. +# WARNING: Never add directories here which local users can modify, that +# may lead to root exploit. Usually this should be done only if you don't +# allow shell access for users. +#valid_chroot_dirs = + +# Default chroot directory for mail processes. This can be overridden for +# specific users in user database by giving /./ in user's home directory +# (eg. /home/./user chroots into /home). Note that usually there is no real +# need to do chrooting, Dovecot doesn't allow users to access files outside +# their mail directory anyway. +#mail_chroot = + +## +## Mailbox handling optimizations +## + +# Space-separated list of fields to initially save into cache file. Currently +# these fields are allowed: +# +# flags, date.sent, date.received, size.virtual, size.physical +# mime.parts, imap.body, imap.bodystructure +# +# Different IMAP clients work in different ways, so they benefit from +# different cached fields. Some do not benefit from them at all. Caching more +# than necessary generates useless disk I/O, so you don't want to do that +# either. +# +# Dovecot attempts to automatically figure out what client wants and it keeps +# only that. However the first few times a mailbox is opened, Dovecot hasn't +# yet figured out what client needs, so it may not perform optimally. If you +# know what fields the majority of your clients need, it may be useful to set +# these fields by hand. If client doesn't actually use them, Dovecot will +# eventually drop them. +# +# Usually you should just leave this field alone. The potential benefits are +# typically unnoticeable. +#mail_cache_fields = + +# Space-separated list of fields that Dovecot should never save to cache file. +# Useful if you want to save disk space at the cost of more I/O when the fields +# needed. +#mail_never_cache_fields = + +# The minimum number of mails in a mailbox before updates are done to cache +# file. This allows optimizing Dovecot's behavior to do less disk writes at +# the cost of more disk reads. +#mail_cache_min_mail_count = 0 + +# When IDLE command is running, mailbox is checked once in a while to see if +# there are any new mails or other changes. This setting defines the minimum +# time in seconds to wait between those checks. Dovecot can also use dnotify, +# inotify and kqueue to find out immediately when changes occur. +#mailbox_idle_check_interval = 30 + +# Save mails with CR+LF instead of plain LF. This makes sending those mails +# take less CPU, especially with sendfile() syscall with Linux and FreeBSD. +# But it also creates a bit more disk I/O which may just make it slower. +# Also note that if other software reads the mboxes/maildirs, they may handle +# the extra CRs wrong and cause problems. +#mail_save_crlf = no + +## +## Maildir-specific settings +## + +# By default LIST command returns all entries in maildir beginning with a dot. +# Enabling this option makes Dovecot return only entries which are directories. +# This is done by stat()ing each entry, so it causes more disk I/O. +# (For systems setting struct dirent->d_type, this check is free and it's +# done always regardless of this setting) +#maildir_stat_dirs = no + +# When copying a message, do it with hard links whenever possible. This makes +# the performance much better, and it's unlikely to have any side effects. +#maildir_copy_with_hardlinks = no + +# When copying a message, try to preserve the base filename. Only if the +# destination mailbox already contains the same name (ie. the mail is being +# copied there twice), a new name is given. The destination filename check is +# done only by looking at dovecot-uidlist file, so if something outside +# Dovecot does similar filename preserving copies, you may run into problems. +# NOTE: This setting requires maildir_copy_with_hardlinks = yes to work. +#maildir_copy_preserve_filename = no + +## +## mbox-specific settings +## + +# Which locking methods to use for locking mbox. There are four available: +# dotlock: Create .lock file. This is the oldest and most NFS-safe +# solution. If you want to use /var/mail/ like directory, the users +# will need write access to that directory. +# fcntl : Use this if possible. Works with NFS too if lockd is used. +# flock : May not exist in all systems. Doesn't work with NFS. +# lockf : May not exist in all systems. Doesn't work with NFS. +# +# You can use multiple locking methods; if you do the order they're declared +# in is important to avoid deadlocks if other MTAs/MUAs are using multiple +# locking methods as well. Some operating systems don't allow using some of +# them simultaneously. +#mbox_read_locks = fcntl +#mbox_write_locks = dotlock fcntl + +# Maximum time in seconds to wait for lock (all of them) before aborting. +#mbox_lock_timeout = 300 + +# If dotlock exists but the mailbox isn't modified in any way, override the +# lock file after this many seconds. +#mbox_dotlock_change_timeout = 120 + +# When mbox changes unexpectedly we have to fully read it to find out what +# changed. If the mbox is large this can take a long time. Since the change +# is usually just a newly appended mail, it'd be faster to simply read the +# new mails. If this setting is enabled, Dovecot does this but still safely +# fallbacks to re-reading the whole mbox file whenever something in mbox isn't +# how it's expected to be. The only real downside to this setting is that if +# some other MUA changes message flags, Dovecot doesn't notice it immediately. +# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK +# commands. +#mbox_dirty_syncs = yes + +# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE, +# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored. +#mbox_very_dirty_syncs = no + +# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK +# commands and when closing the mailbox). This is especially useful for POP3 +# where clients often delete all mails. The downside is that our changes +# aren't immediately visible to other MUAs. +#mbox_lazy_writes = yes + +# If mbox size is smaller than this (in kilobytes), don't write index files. +# If an index file already exists it's still read, just not updated. +#mbox_min_index_size = 0 + +## +## dbox-specific settings +## + +# Maximum dbox file size in kilobytes until it's rotated. +#dbox_rotate_size = 2048 + +# Minimum dbox file size in kilobytes before it's rotated +# (overrides dbox_rotate_days) +#dbox_rotate_min_size = 16 + +# Maximum dbox file age in days until it's rotated. Day always begins from +# midnight, so 1 = today, 2 = yesterday, etc. 0 = check disabled. +#dbox_rotate_days = 0 + +## +## IMAP specific settings +## + +protocol imap { + # Login executable location. + #login_executable = /usr/lib/dovecot/imap-login + + # IMAP executable location. Changing this allows you to execute other + # binaries before the imap process is executed. + # + # This would write rawlogs into ~/dovecot.rawlog/ directory: + # mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap + # + # This would attach gdb into the imap process and write backtraces into + # /tmp/gdbhelper.* files: + # mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap + # + #mail_executable = /usr/lib/dovecot/imap + mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap + + # Maximum IMAP command line length in bytes. Some clients generate very long + # command lines with huge mailboxes, so you may need to raise this if you get + # "Too long argument" or "IMAP command line too large" errors often. + #imap_max_line_length = 65536 + + # Support for dynamically loadable plugins. mail_plugins is a space separated + # list of plugins to load. + mail_plugins = quota imap_quota + #mail_plugin_dir = /usr/lib/dovecot/modules/imap + + # Send IMAP capabilities in greeting message. This makes it unnecessary for + # clients to request it with CAPABILITY command, so it saves one round-trip. + # Many clients however don't understand it and ask the CAPABILITY anyway. + #login_greeting_capability = no + + # Override the IMAP CAPABILITY response. + #imap_capability = + + # Workarounds for various client bugs: + # delay-newmail: + # Send EXISTS/RECENT new mail notifications only when replying to NOOP + # and CHECK commands. Some clients ignore them otherwise, for example OSX + # Mail (= 2.1.4) : %v.%u + # Older Dovecots : %v.%u + # tpop3d : %Mf + # + # Note that Outlook 2003 seems to have problems with %v.%u format which was + # Dovecot's default, so if you're building a new server it would be a good + # idea to change this. %08Xu%08Xv should be pretty fail-safe. + # + # NOTE: Nowadays this is required to be set explicitly, since the old + # default was bad but it couldn't be changed without breaking existing + # installations. %08Xu%08Xv will be the new default, so use it for new + # installations. + # + pop3_uidl_format = %08Xu%08Xv + + # POP3 logout format string: + # %t - number of TOP commands + # %p - number of bytes sent to client as a result of TOP command + # %r - number of RETR commands + # %b - number of bytes sent to client as a result of RETR command + # %d - number of deleted messages + # %m - number of messages (before deletion) + # %s - mailbox size in bytes (before deletion) + #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s + + # Support for dynamically loadable plugins. mail_plugins is a space separated + # list of plugins to load. + mail_plugins = quota + #mail_plugin_dir = /usr/lib/dovecot/modules/pop3 + + # Workarounds for various client bugs: + # outlook-no-nuls: + # Outlook and Outlook Express hang if mails contain NUL characters. + # This setting replaces them with 0x80 character. + # oe-ns-eoh: + # Outlook Express and Netscape Mail breaks if end of headers-line is + # missing. This option simply sends it if it's missing. + # The list is space-separated. + #pop3_client_workarounds = +} + +## +## MANAGESIEVE specific settings +## + +protocol managesieve { + # Login executable location. + #login_executable = /usr/libexec/dovecot/managesieve-login + + # MANAGESIEVE executable location. See IMAP's mail_executable above for + # examples how this could be changed. + #mail_executable = /usr/libexec/dovecot/managesieve + + # Maximum MANAGESIEVE command line length in bytes. This setting is + # directly borrowed from IMAP. But, since long command lines are very + # unlikely with MANAGESIEVE, changing this will not be very useful. + #managesieve_max_line_length = 65536 + + # Specifies the location of the symlink pointing to the active script in + # the sieve storage directory. This must match the SIEVE setting used by + # deliver (refer to http://wiki.dovecot.org/LDA/Sieve#location for more + # info). Variable substitution with % is recognized. + sieve=~/.dovecot.sieve + + # This specifies the path to the directory where the uploaded scripts must + # be stored. In terms of '%' variable substitution it is identical to + # dovecot's mail_location setting used by the mail protocol daemons. + sieve_storage=~/sieve + + # If, for some inobvious reason, the sieve_storage remains unset, the + # managesieve daemon uses the specification of the mail_location to find out + # where to store the sieve files (see explaination in README.managesieve). + # The example below, when uncommented, overrides any global mail_location + # specification and stores all the scripts in '~/mail/sieve' if sieve_storage + # is unset. However, you should always use the sieve_storage setting. + # mail_location = mbox:~/mail + + # To fool managesieve clients that are focused on timesieved you can + # specify the IMPLEMENTATION capability that the dovecot reports to clients + # (default: dovecot). + #managesieve_implementation_string = Cyrus timsieved v2.2.13 +} + +## +## LDA specific settings +## + +protocol lda { + # Address to use when sending rejection mails. + postmaster_address = postmaster@example.com + + # Hostname to use in various parts of sent mails, eg. in Message-Id. + # Default is the system's real hostname. + #hostname = + + # Support for dynamically loadable plugins. mail_plugins is a space separated + # list of plugins to load. + #mail_plugins = + mail_plugin_dir = /usr/lib/dovecot/modules/lda + + # Binary to use for sending mails. + #sendmail_path = /usr/lib/sendmail + + # UNIX socket path to master authentication server to find users. + auth_socket_path = /var/run/dovecot/auth-master + + # Enabling Sieve plugin for server-side mail filtering + mail_plugins = cmusieve quota +} + +## +## Authentication processes +## + +# Executable location +#auth_executable = /usr/lib/dovecot/dovecot-auth + +# Set max. process size in megabytes. +#auth_process_size = 256 + +# Authentication cache size in kilobytes. 0 means it's disabled. +# Note that bsdauth, PAM and vpopmail require cache_key to be set for caching +# to be used. +#auth_cache_size = 0 +# Time to live in seconds for cached data. After this many seconds the cached +# record is no longer used, *except* if the main database lookup returns +# internal failure. We also try to handle password changes automatically: If +# user's previous authentication was successful, but this one wasn't, the +# cache isn't used. For now this works only with plaintext authentication. +#auth_cache_ttl = 3600 + +# Space separated list of realms for SASL authentication mechanisms that need +# them. You can leave it empty if you don't want to support multiple realms. +# Many clients simply use the first one listed here, so keep the default realm +# first. +#auth_realms = + +# Default realm/domain to use if none was specified. This is used for both +# SASL realms and appending @domain to username in plaintext logins. +#auth_default_realm = + +# List of allowed characters in username. If the user-given username contains +# a character not listed in here, the login automatically fails. This is just +# an extra check to make sure user can't exploit any potential quote escaping +# vulnerabilities with SQL/LDAP databases. If you want to allow all characters, +# set this value to empty. +#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@ + +# Username character translations before it's looked up from databases. The +# value contains series of from -> to characters. For example "#@/@" means +# that '#' and '/' characters are translated to '@'. +#auth_username_translation = + +# Username formatting before it's looked up from databases. You can use +# the standard variables here, eg. %Lu would lowercase the username, %n would +# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into +# "-AT-". This translation is done after auth_username_translation changes. +#auth_username_format = + +# If you want to allow master users to log in by specifying the master +# username within the normal username string (ie. not using SASL mechanism's +# support for it), you can specify the separator character here. The format +# is then . UW-IMAP uses "*" as the +# separator, so that could be a good choice. +#auth_master_user_separator = + +# Username to use for users logging in with ANONYMOUS SASL mechanism +#auth_anonymous_username = anonymous + +# More verbose logging. Useful for figuring out why authentication isn't +# working. +#auth_verbose = no + +# Even more verbose logging for debugging purposes. Shows for example SQL +# queries. +#auth_debug = no + +# In case of password mismatches, log the passwords and used scheme so the +# problem can be debugged. Requires auth_debug=yes to be set. +#auth_debug_passwords = no + +# Maximum number of dovecot-auth worker processes. They're used to execute +# blocking passdb and userdb queries (eg. MySQL and PAM). They're +# automatically created and destroyed as needed. +#auth_worker_max_count = 30 + +# Host name to use in GSSAPI principal names. The default is to use the +# name returned by gethostname(). +#auth_gssapi_hostname = + +# Kerberos keytab to use for the GSSAPI mechanism. Will use the system +# default (usually /etc/krb5.keytab) if not specified. +#auth_krb5_keytab = + +auth default { + # Space separated list of wanted authentication mechanisms: + # plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi + # NOTE: See also disable_plaintext_auth setting. + mechanisms = plain login + + # + # Password database is used to verify user's password (and nothing more). + # You can have multiple passdbs and userdbs. This is useful if you want to + # allow both system users (/etc/passwd) and virtual users to login without + # duplicating the system users into virtual database. + # + # + # + # By adding master=yes setting inside a passdb you make the passdb a list + # of "master users", who can log in as anyone else. Unless you're using PAM, + # you probably still want the destination user to be looked up from passdb + # that it really exists. This can be done by adding pass=yes setting to the + # master passdb. + + # Users can be temporarily disabled by adding a passdb with deny=yes. + # If the user is found from that database, authentication will fail. + # The deny passdb should always be specified before others, so it gets + # checked first. Here's an example: + + #passdb passwd-file { + # File contains a list of usernames, one per line + #args = /etc/dovecot.deny + #deny = yes + #} + + # PAM authentication. Preferred nowadays by most systems. + # Note that PAM can only be used to verify if user's password is correct, + # so it can't be used as userdb. If you don't want to use a separate user + # database (passwd usually), you can use static userdb. + # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM + # authentication to actually work. + passdb pam { + # [blocking=yes] [session=yes] [setcred=yes] + # [cache_key=] [] + # + # By default a new process is forked from dovecot-auth for each PAM lookup. + # Setting blocking=yes uses the alternative way: dovecot-auth worker + # processes do the PAM lookups. + # + # session=yes makes Dovecot open and immediately close PAM session. Some + # PAM plugins need this to work, such as pam_mkhomedir. + # + # setcred=yes makes Dovecot establish PAM credentials if some PAM plugins + # need that. They aren't ever deleted though, so this isn't enabled by + # default. + # + # cache_key can be used to enable authentication caching for PAM + # (auth_cache_size also needs to be set). It isn't enabled by default + # because PAM modules can do all kinds of checks besides checking password, + # such as checking IP address. Dovecot can't know about these checks + # without some help. cache_key is simply a list of variables (see + # /usr/share/doc/dovecot-common/wiki/Variables.txt) which must match for + # the cached data to be used. Here are some examples: + # %u - Username must match. Probably sufficient for most uses. + # %u%r - Username and remote IP address must match. + # %u%s - Username and service (ie. IMAP, POP3) must match. + # + # If service name is "*", it means the authenticating service name + # is used, eg. pop3 or imap (/etc/pam.d/pop3, /etc/pam.d/imap). + # + # Some examples: + # args = session=yes * + # args = cache_key=%u dovecot + #args = dovecot + } + + # System users (NSS, /etc/passwd, or similiar) + # In many systems nowadays this uses Name Service Switch, which is + # configured in /etc/nsswitch.conf. + #passdb passwd { + # [blocking=yes] - See userdb passwd for explanation + #args = + #} + + # Shadow passwords for system users (NSS, /etc/shadow or similiar). + # Deprecated by PAM nowadays. + # + #passdb shadow { + # [blocking=yes] - See userdb passwd for explanation + #args = + #} + + # PAM-like authentication for OpenBSD. + # + #passdb bsdauth { + # [cache_key=] - See cache_key in PAM for explanation. + #args = + #} + + # passwd-like file with specified location + # + #passdb passwd-file { + # Path for passwd-file + #args = + #} + + # checkpassword executable authentication + # NOTE: You will probably want to use "userdb prefetch" with this. + # + #passdb checkpassword { + # Path for checkpassword binary + #args = + #} + + # SQL database + passdb sql { + # Path for SQL configuration file + args = /etc/dovecot/dovecot-sql.conf + } + + # LDAP database + #passdb ldap { + # Path for LDAP configuration file + #args = /etc/dovecot/dovecot-ldap.conf + #} + + # vpopmail authentication + #passdb vpopmail { + # [cache_key=] - See cache_key in PAM for explanation. + #args = + #} + + # + # User database specifies where mails are located and what user/group IDs + # own them. For single-UID configuration use "static". + # + # + # + + # System users (NSS, /etc/passwd, or similiar). In many systems nowadays this + # uses Name Service Switch, which is configured in /etc/nsswitch.conf. + # + #userdb passwd { + # [blocking=yes] - By default the lookups are done in the main dovecot-auth + # process. This setting causes the lookups to be done in auth worker + # proceses. Useful with remote NSS lookups that may block. + # NOTE: Be sure to use this setting with nss_ldap or users might get + # logged in as each others! + #args = + #} + + # passwd-like file with specified location + # + #userdb passwd-file { + # Path for passwd-file + #args = + #} + + # static settings generated from template + #userdb static { + # Template for the fields. Can return anything a userdb could normally + # return. For example: + # + # args = uid=500 gid=500 home=/var/mail/%u + # + # If you use deliver, it needs to look up users only from the userdb. This + # of course doesn't work with static because there is no list of users. + # Normally static userdb handles this by doing a passdb lookup. This works + # with most passdbs, with PAM being the most notable exception. If you do + # the user verification another way, you can add allow_all_users=yes to + # the args in which case the passdb lookup is skipped. + # + #args = + #} + + # SQL database + userdb sql { + # Path for SQL configuration file + args = /etc/dovecot/dovecot-sql.conf + } + + # LDAP database + #userdb ldap { + # Path for LDAP configuration file + #args = /etc/dovecot/dovecot-ldap.conf + #} + + # vpopmail + #userdb vpopmail { + #} + + # "prefetch" user database means that the passdb already provided the + # needed information and there's no need to do a separate userdb lookup. + # This can be made to work with SQL and LDAP databases, see their example + # configuration files for more information how to do it. + # + #userdb prefetch { + #} + + # User to use for the process. This user needs access to only user and + # password databases, nothing else. Only shadow and pam authentication + # requires roots, so use something else if possible. Note that passwd + # authentication with BSDs internally accesses shadow files, which also + # requires roots. Note that this user is NOT used to access mails. + # That user is specified by userdb above. + user = root + + # Directory where to chroot the process. Most authentication backends don't + # work if this is set, and there's no point chrooting if auth_user is root. + # Note that valid_chroot_dirs isn't needed to use this setting. + #chroot = + + # Number of authentication processes to create + #count = 1 + + # Require a valid SSL client certificate or the authentication fails. + #ssl_require_client_cert = no + + # Take the username from client's SSL certificate, using + # X509_NAME_get_text_by_NID() which returns the subject's DN's + # CommonName. + #ssl_username_from_cert = no + + # It's possible to export the authentication interface to other programs: + #socket listen { + #master { + # Master socket provides access to userdb information. It's typically + # used to give Dovecot's local delivery agent access to userdb so it + # can find mailbox locations. + #path = /var/run/dovecot/auth-master + #mode = 0600 + # Default user/group is the one who started dovecot-auth (root) + #user = + #group = + #} + #client { + # The client socket is generally safe to export to everyone. Typical use + # is to export it to your SMTP server so it can do SMTP AUTH lookups + # using it. + #path = /var/run/dovecot/auth-client + #mode = 0660 + #} + #} + + ## dovecot-lda specific settings + ## + socket listen { + master { + path = /var/run/dovecot/auth-master + mode = 0600 + user = vmail # User running Dovecot LDA + #group = vmail # Or alternatively mode 0660 + LDA user in this group + } + client { + path = /var/spool/postfix/private/auth + mode = 0660 + user = postfix + group = postfix + } + } + +} + +# If you wish to use another authentication server than dovecot-auth, you can +# use connect sockets. They are assumed to be already running, Dovecot's master +# process only tries to connect to them. They don't need any other settings +# than the path for the master socket, as the configuration is done elsewhere. +# Note that the client sockets must exist in the login_dir. +#auth external { +# socket connect { +# master { +# path = /var/run/dovecot/auth-master +# } +# } +#} + +## +## Dictionary server settings +## + +# Dictionary can be used by some plugins to store key=value lists. +# Currently this is only used by dict quota backend. The dictionary can be +# used either directly or though a dictionary server. The following dict block +# maps dictionary names to URIs when the server is used. These can then be +# referenced using URIs in format "proxy:". + +dict { + #quota = mysql:/etc/dovecot-dict-quota.conf +} + +## +## Plugin settings +## + +plugin { + # Here you can give some extra environment variables to mail processes. + # This is mostly meant for passing parameters to plugins. %variable + # expansion is done for all values. + + # Quota plugin. Multiple backends are supported: + # dirsize: Find and sum all the files found from mail directory. + # Extremely SLOW with Maildir. It'll eat your CPU and disk I/O. + # dict: Keep quota stored in dictionary (eg. SQL) + # maildir: Maildir++ quota + # fs: Read-only support for filesystem quota + quota = maildir + + # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir + # directory. You can also optionally give a global ACL directory path where + # ACLs are applied to all users' mailboxes. The global ACL directory contains + # one file for each mailbox, eg. INBOX or sub.mailbox. + #acl = vfile:/etc/dovecot-acls + + # Convert plugin. If set, specifies the source storage path which is + # converted to destination storage (mail_location) when the user logs in. + # The existing mail directory is renamed to -converted. + #convert_mail = mbox:%h/mail + # Skip mailboxes which we can't open successfully instead of aborting. + #convert_skip_broken_mailboxes = no + + # Trash plugin. When saving a message would make user go over quota, this + # plugin automatically deletes the oldest mails from configured mailboxes + # until the message can be saved within quota limits. The configuration file + # is a text file where each line is in format: + # Mails are first deleted in lowest -> highest priority number order + #trash = /etc/dovecot-trash.conf + + # Lazy expunge plugin. Currently works only with maildirs. When a user + # expunges mails, the mails are moved to a mailbox in another namespace + # (1st). When a mailbox is deleted, the mailbox is moved to another namespace + # (2nd) as well. Also if the deleted mailbox had any expunged messages, + # they're moved to a 3rd namespace. The mails won't be counted in quota, + # and they're not deleted automatically (use a cronjob or something). + #lazy_expunge = .EXPUNGED/ .DELETED/ .DELETED/.EXPUNGED/ +} diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index 080f9fd713213c7475a4907f18355989d71aa0ba..240a8fa3346e199b4778a256ac8e9899bcb2f899 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -17,6 +17,8 @@ loglevel=2 module=postfix_mysql maildir_path=/var/vmail/[domain]/[localpart] homedir_path=/var/vmail +pop3_imap_daemon=courier +mail_filter_syntax=maildrop mailuser_uid=5000 mailuser_gid=5000 mailuser_name=vmail diff --git a/install/update.php b/install/update.php index 479ad9e8dfcc3566b6325ce68a56684232806436..00a9b1d6bcab510561ab6c942a57a8e01a90f94c 100644 --- a/install/update.php +++ b/install/update.php @@ -314,9 +314,15 @@ if($reconfigure_services_answer == 'yes') { swriteln('Configuring PAM'); $inst->configure_pam(); - //** Configure courier - swriteln('Configuring Courier'); - $inst->configure_courier(); + if($conf['dovecot']['installed'] == true) { + //* Configure dovecot + swriteln('Configuring Dovecot'); + $inst->configure_dovecot(); + } else { + //* Configure courier + swriteln('Configuring Courier'); + $inst->configure_courier(); + } //** Configure Spamasassin swriteln('Configuring Spamassassin'); @@ -408,6 +414,7 @@ if($reconfigure_services_answer == 'yes') { if($conf['courier']['courier-imap-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart'); if($conf['courier']['courier-pop'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart'); if($conf['courier']['courier-pop-ssl'] != '' && is_file($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'])) system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); + if($conf['dovecot']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['dovecot']['init_script'])) system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart'); } if($conf['services']['web']) { if($conf['apache']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['apache']['init_script'])) system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart'); diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php index 7d9d493ecd8224a1126f8982488ac907b9037ca0..9119507b3007789e6d2c4c0fb7001026c325ceeb 100644 --- a/interface/web/admin/form/server_config.tform.php +++ b/interface/web/admin/form/server_config.tform.php @@ -169,6 +169,18 @@ $form["tabs"]['mail'] = array ( 'width' => '40', 'maxlength' => '255' ), + 'pop3_imap_daemon' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => '20', + 'value' => array('courier' => 'Courier', 'dovecot' => 'Dovecot') + ), + 'mail_filter_syntax' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => '20', + 'value' => array('maildrop' => 'Maildrop', 'sieve' => 'Sieve') + ), 'mailuser_uid' => array ( 'datatype' => 'INTEGER', 'formtype' => 'TEXT', diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng index 85828181438227696f8f5fa72eaf78e4e47b5fc1..890d8e494987b95ba2d76ad05add4122fb37abd4 100644 --- a/interface/web/admin/lib/lang/en_server_config.lng +++ b/interface/web/admin/lib/lang/en_server_config.lng @@ -59,4 +59,6 @@ $wb["bind_group_error_empty"] = 'BIND group is empty.'; $wb["bind_zonefiles_dir_error_empty"] = 'BIND zonefiles directory is empty.'; $wb["named_conf_path_error_empty"] = 'BIND named.conf path is empty.'; $wb["named_conf_local_path_error_empty"] = 'BIND named.conf.local path is empty.'; +$wb["mail_filter_syntax_txt"] = 'Mailfilter Syntax'; +$wb["pop3_imap_daemon_txt"] = 'POP3/IMAP Daemon'; ?> \ No newline at end of file diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm index c6943505c34cdbda331620e0648c08fc14bdc5b2..f5d98196e4576f615b456d5aa653e0623f806873 100644 --- a/interface/web/admin/templates/server_config_mail_edit.htm +++ b/interface/web/admin/templates/server_config_mail_edit.htm @@ -1,68 +1,84 @@ -

-

- -
- -
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - - -
- - -
-
- -
+

+

+ +
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+

{tmpl_var name='pop3_imap_daemon_txt'}

+
+ +
+
+
+

{tmpl_var name='mail_filter_syntax_txt'}

+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + +
+ + +
+
+ +
diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php index 22dea8488d3c5f4d4b9de267d5f6422757477c30..920d83472282e291b4b0462006c3b121903bc28c 100644 --- a/interface/web/mail/form/mail_user.tform.php +++ b/interface/web/mail/form/mail_user.tform.php @@ -151,14 +151,14 @@ $form["tabs"]['mailuser'] = array ( 'disableimap' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', - 'default' => '0', - 'value' => array(1 => '1',0 => '0') + 'default' => 'n', + 'value' => array(1 => 'y',0 => 'n') ), 'disablepop3' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'CHECKBOX', - 'default' => 'y', - 'value' => array(1 => '1',0 => '0') + 'default' => 'n', + 'value' => array(1 => 'y',0 => 'n') ), ################################## # ENDE Datatable fields diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index 374c77743095655c33bae72eb393b6d66810cba5..50683eeb6987ef260a049d30419dbef923c22a6d 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -250,6 +250,17 @@ class page_action extends tform_actions { } } // endif spamfilter policy + + // Set the fields for dovecot + if(isset($this->dataRecord["email"])) { + $disableimap = ($this->dataRecord["disableimap"])?'y':'n'; + $disablepop3 = ($this->dataRecord["disablepop3"])?'y':'n'; + $disabledeliver = ($this->dataRecord["postfix"] == 'y')?'n':'y'; + $disablesmtp = ($this->dataRecord["postfix"] == 'y')?'n':'y'; + + $sql = "UPDATE mail_user SET disableimap = '$disableimap', disablepop3 = '$disablepop3', disablesmtp = '$disablesmtp', disabledeliver = '$disabledeliver' WHERE mailuser_id = ".$this->id; + $app->db->query($sql); + } } function onAfterUpdate() { @@ -281,6 +292,17 @@ class page_action extends tform_actions { } // endif spamfilter policy } + // Set the fields for dovecot + if(isset($this->dataRecord["email"])) { + $disableimap = ($this->dataRecord["disableimap"])?'y':'n'; + $disablepop3 = ($this->dataRecord["disablepop3"])?'y':'n'; + $disabledeliver = ($this->dataRecord["postfix"] == 'y')?'n':'y'; + $disablesmtp = ($this->dataRecord["postfix"] == 'y')?'n':'y'; + + $sql = "UPDATE mail_user SET disableimap = '$disableimap', disablepop3 = '$disablepop3', disablesmtp = '$disablesmtp', disabledeliver = '$disabledeliver' WHERE mailuser_id = ".$this->id; + $app->db->query($sql); + } + } } diff --git a/interface/web/mail/mail_user_filter_edit.php b/interface/web/mail/mail_user_filter_edit.php index ed43ebc13322d15eecd6314279bc7ef8c2cb555e..03b5232f637d53bc3632170c16a561f94e1e8bd1 100644 --- a/interface/web/mail/mail_user_filter_edit.php +++ b/interface/web/mail/mail_user_filter_edit.php @@ -92,7 +92,7 @@ class page_action extends tform_actions { $found = false; foreach($lines as $line) { - $line = trim($line); + $line = rtrim($line); if($line == '### BEGIN FILTER_ID:'.$this->id) { $skip = true; $found = true; @@ -117,21 +117,69 @@ class page_action extends tform_actions { function getRule() { - $content = ''; - $content .= '### BEGIN FILTER_ID:'.$this->id."\n"; + global $app,$conf; + + $app->uses("getconf"); + $mailuser_rec = $app->db->queryOneRecord("SELECT server_id FROM mail_user WHERE mailuser_id = ".intval($this->dataRecord["mailuser_id"])); + $mail_config = $app->getconf->get_server_config(intval($mailuser_rec["server_id"]),'mail'); + + if($mail_config['mail_filter_syntax'] == 'sieve') { + + // ####################################################### + // Filter in Sieve Syntax + // ####################################################### + + $content = ''; + $content .= '### BEGIN FILTER_ID:'.$this->id."\n"; + + //$content .= 'require ["fileinto", "regex", "vacation"];'."\n"; + + $content .= 'if header :regex ["'.strtolower($this->dataRecord["source"]).'"] ["'; + + $searchterm = preg_quote($this->dataRecord["searchterm"]); + + if($this->dataRecord["op"] == 'contains') { + $content .= ".*".$searchterm; + } elseif ($this->dataRecord["op"] == 'is') { + $content .= $searchterm."$"; + } elseif ($this->dataRecord["op"] == 'begins') { + $content .= " ".$searchterm.""; + } elseif ($this->dataRecord["op"] == 'ends') { + $content .= ".*".$searchterm."$"; + } + + $content .= '"] {'."\n"; + + if($this->dataRecord["action"] == 'move') { + $content .= ' fileinto "'.$this->dataRecord["target"].'";' . "\n"; + } else { + $content .= " discard;\n"; + } + + $content .= " stop;\n}\n"; + + $content .= '### END FILTER_ID:'.$this->id."\n"; + + } else { + + // ####################################################### + // Filter in Maildrop Syntax + // ####################################################### + $content = ''; + $content .= '### BEGIN FILTER_ID:'.$this->id."\n"; - $TargetNoQuotes = $this->dataRecord["target"]; - $TargetQuotes = "\"$TargetNoQuotes\""; + $TargetNoQuotes = $this->dataRecord["target"]; + $TargetQuotes = "\"$TargetNoQuotes\""; - $TestChDirNoQuotes = '$DEFAULT/.'.$TargetNoQuotes; - $TestChDirQuotes = "\"$TestChDirNoQuotes\""; + $TestChDirNoQuotes = '$DEFAULT/.'.$TargetNoQuotes; + $TestChDirQuotes = "\"$TestChDirNoQuotes\""; - $MailDirMakeNoQuotes = $TargetQuotes.' $DEFAULT'; + $MailDirMakeNoQuotes = $TargetQuotes.' $DEFAULT'; - $EchoTargetFinal = $TargetNoQuotes; + $EchoTargetFinal = $TargetNoQuotes; - if($this->dataRecord["action"] == 'move') { + if($this->dataRecord["action"] == 'move') { $content .= " `test -e ".$TestChDirQuotes." && exit 1 || exit 0` @@ -142,38 +190,40 @@ if ( ".'$RETURNCODE'." != 1 ) `echo \"INBOX.$EchoTargetFinal\" >> ".'$DEFAULT'."/courierimapsubscribed` } "; - } + } - $content .= "if (/^".$this->dataRecord["source"].":"; + $content .= "if (/^".$this->dataRecord["source"].":"; - $searchterm = preg_quote($this->dataRecord["searchterm"]); + $searchterm = preg_quote($this->dataRecord["searchterm"]); - if($this->dataRecord["op"] == 'contains') { - $content .= ".*".$searchterm."/:h)\n"; - } elseif ($this->dataRecord["op"] == 'is') { - $content .= $searchterm."$/:h)\n"; - } elseif ($this->dataRecord["op"] == 'begins') { - $content .= " ".$searchterm."/:h)\n"; - } elseif ($this->dataRecord["op"] == 'ends') { - $content .= ".*".$searchterm."$/:h)\n"; - } + if($this->dataRecord["op"] == 'contains') { + $content .= ".*".$searchterm."/:h)\n"; + } elseif ($this->dataRecord["op"] == 'is') { + $content .= $searchterm."$/:h)\n"; + } elseif ($this->dataRecord["op"] == 'begins') { + $content .= " ".$searchterm."/:h)\n"; + } elseif ($this->dataRecord["op"] == 'ends') { + $content .= ".*".$searchterm."$/:h)\n"; + } - $content .= "{\n"; - $content .= "exception {\n"; + $content .= "{\n"; + $content .= "exception {\n"; - if($this->dataRecord["action"] == 'move') { - $content .= 'ID' . "$this->id" . 'EndFolder = "$DEFAULT/.' . $this->dataRecord['target'] . '/"' . "\n"; - $content .= "to ". '$ID' . "$this->id" . 'EndFolder' . "\n"; - } else { - $content .= "to /dev/null\n"; - } + if($this->dataRecord["action"] == 'move') { + $content .= 'ID' . "$this->id" . 'EndFolder = "$DEFAULT/.' . $this->dataRecord['target'] . '/"' . "\n"; + $content .= "to ". '$ID' . "$this->id" . 'EndFolder' . "\n"; + } else { + $content .= "to /dev/null\n"; + } - $content .= "}\n"; - $content .= "}\n"; + $content .= "}\n"; + $content .= "}\n"; - //} + //} - $content .= '### END FILTER_ID:'.$this->id."\n"; + $content .= '### END FILTER_ID:'.$this->id."\n"; + + } return $content; } diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master new file mode 100644 index 0000000000000000000000000000000000000000..c3393cf7c98c434e812755c55c96128c54c2eb27 --- /dev/null +++ b/server/conf/sieve_filter.master @@ -0,0 +1,30 @@ + +require ["fileinto", "regex", "vacation"]; + + +# Move spam to spam folder +if header :contains "X-Spam-Flag" "YES" { + fileinto "Junk"; + # Stop here so that we do not reply on spams + stop; +} + + + + + +################################################################# +# Autoreply +################################################################# + +# Move spam to spam folder +if header :contains "X-Spam-Flag" "YES" { + fileinto "Junk"; + # Stop here so that we do not reply on spams + stop; +} +vacation :days 1 + :subject "Out of office reply" + # :addresses ["test@test.int", "till@test.int"] + ""; + diff --git a/server/plugins-available/mail_plugin.inc.php b/server/plugins-available/mail_plugin.inc.php index a652b2d9703b7e679515cfa6f49197ad8ee194cb..e7f510fdedbee74b925032f0dd418f1fd406e3fc 100644 --- a/server/plugins-available/mail_plugin.inc.php +++ b/server/plugins-available/mail_plugin.inc.php @@ -91,12 +91,21 @@ class mail_plugin { $tmp_basepath_parts = explode('/',$tmp_basepath); unset($tmp_basepath_parts[count($tmp_basepath_parts)-1]); $base_path = implode('/',$tmp_basepath_parts); + + //* Create the mail domain directory, if it does not exist if(!empty($base_path) && !is_dir($base_path)) { exec("su -c 'mkdir -p ".escapeshellcmd($base_path)."' ".$mail_config['mailuser_name']); $app->log('Created Directory: '.$base_path,LOGLEVEL_DEBUG); } + + // Dovecot uses a different mail layout with a separate 'Maildir' subdirectory. + if($mail_config['pop3_imap_daemon'] == 'dovecot') { + exec("su -c 'mkdir -p ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']); + $app->log('Created Directory: '.$base_path,LOGLEVEL_DEBUG); + $maildomain_path .= '/Maildir'; + } //* When the mail user dir exists but it is not a valid maildir, remove it if(!empty($maildomain_path) && is_dir($maildomain_path) && !is_dir($maildomain_path.'/new') && !is_dir($maildomain_path.'/cur')) { @@ -172,6 +181,13 @@ class mail_plugin { $app->log('Created Directory: '.$base_path,LOGLEVEL_DEBUG); } + // Dovecot uses a different mail layout with a separate 'Maildir' subdirectory. + if($mail_config['pop3_imap_daemon'] == 'dovecot') { + exec("su -c 'mkdir -p ".escapeshellcmd($maildomain_path)."' ".$mail_config['mailuser_name']); + $app->log('Created Directory: '.$base_path,LOGLEVEL_DEBUG); + $maildomain_path .= '/Maildir'; + } + //* When the mail user dir exists but it is not a valid maildir, remove it if(!empty($maildomain_path) && is_dir($maildomain_path) && !is_dir($maildomain_path.'/new') && !is_dir($maildomain_path.'/cur')) { exec("su -c 'rm -rf ".escapeshellcmd($data['new']['maildir'])."' vmail"); @@ -220,10 +236,16 @@ class mail_plugin { $app->log('Moved Maildir from: '.$data['old']['maildir'].' to '.$data['new']['maildir'],LOGLEVEL_DEBUG); } //This is to fix the maildrop quota not being rebuilt after the quota is changed. + // Courier Layout if(is_dir($data['new']['maildir'].'/new')) { exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name']); $app->log('Updated Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG); } + // Dovecot Layout + if(is_dir($data['new']['maildir'].'/Maildir/new')) { + exec("su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."/Maildir' ".$mail_config['mailuser_name']); + $app->log('Updated Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."/Maildir' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG); + } } function user_delete($event_name,$data) { diff --git a/server/plugins-available/maildeliver_plugin.inc.php b/server/plugins-available/maildeliver_plugin.inc.php new file mode 100644 index 0000000000000000000000000000000000000000..7fc8a4e7620f2c8330f1883dbe5c475c10add4d8 --- /dev/null +++ b/server/plugins-available/maildeliver_plugin.inc.php @@ -0,0 +1,131 @@ +plugins->registerEvent('mail_user_update','maildeliver_plugin','update'); + $app->plugins->registerEvent('mail_user_delete','maildeliver_plugin','delete'); + + } + + + function update($event_name,$data) { + global $app, $conf; + + // load the server configuration options + $app->uses("getconf"); + $mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail'); + if(substr($mail_config["homedir_path"],-1) == '/') { + $mail_config["homedir_path"] = substr($mail_config["homedir_path"],0,-1); + } + + if(isset($data["new"]["email"])) { + $email_parts = explode("@",$data["new"]["email"]); + } else { + $email_parts = explode("@",$data["old"]["email"]); + } + + // Write the custom mailfilter script, if mailfilter recipe has changed + if($data["old"]["custom_mailfilter"] != $data["new"]["custom_mailfilter"] + or $data["old"]["move_junk"] != $data["new"]["move_junk"] + or $data["old"]["autoresponder_text"] != $data["new"]["autoresponder_text"] + or $data["old"]["autoresponder"] != $data["new"]["autoresponder"] + or (isset($data["new"]["email"]) and $data["old"]["email"] != $data["new"]["email"]) + or $data["old"]["autoresponder_start_date"] != $data["new"]["autoresponder_start_date"] + or $data["old"]["autoresponder_end_date"] != $data["new"]["autoresponder_end_date"]) { + + $app->log("Mailfilter config has been changed",LOGLEVEL_DEBUG); + + $sieve_file = $data["new"]["maildir"].'/.sieve'; + if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file",LOGLEVEL_WARN); + + $app->load('tpl'); + + $tpl = new tpl(); + $tpl->newTemplate("sieve_filter.master"); + + // Custom filters + $tpl->setVar('custom_mailfilter',$data["new"]["custom_mailfilter"]); + + // Move junk + $tpl->setVar('move_junk',$data["new"]["move_junk"]); + + // Autoresponder + $tpl->setVar('autoresponder',$data["new"]["autoresponder"]); + $tpl->setVar('autoresponder_text',$data["new"]["autoresponder_text"]); + + file_put_contents($sieve_file,$tpl->grab()); + + unset($tpl); + + } + } + + function delete($event_name,$data) { + global $app, $conf; + + $sieve_file = $data["old"]["maildir"].'/.sieve'; + if(is_file($sieve_file)) unlink($sieve_file) or $app->log("Unable to delete file: $sieve_file",LOGLEVEL_WARN); + } + + +} // end class + +?> \ No newline at end of file diff --git a/server/plugins-available/maildrop_plugin.inc.php b/server/plugins-available/maildrop_plugin.inc.php index 6ba390f653b21ff6580f9c3899195c1ecb668f78..8891ead2da86d7332dbf95af722530619dd63f08 100644 --- a/server/plugins-available/maildrop_plugin.inc.php +++ b/server/plugins-available/maildrop_plugin.inc.php @@ -41,7 +41,7 @@ class maildrop_plugin { function onInstall() { global $conf; - if($conf['services']['mail'] == true) { + if($conf['services']['mail'] == true && isset($conf['courier']['installed']) && $conf['courier']['installed'] == true) { return true; } else { return false;