Skip to content

Commit 4a75ab8

Browse files
author
latham
committed
start enableing email quotas.
1 parent 94cb904 commit 4a75ab8

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

install/tpl/debian6_dovecot.conf.master

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,7 @@ protocol lda {
4848

4949
## Plugin settings
5050
plugin {
51-
quota = maildir
52-
53-
# Disabled user quota reporting for the first upload
54-
# quota = dict:user::file:/var/vmail/%n_%d_quota
51+
quota = dict:user::file:/var/vmail/%n_%d_quota
5552
# Because the mail quota is called in the user query
5653
# the maildir quota does not need to be set.
5754
# You do not need: quota = maildir

interface/web/client/form/client.tform.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
'datatype' => 'VARCHAR',
221221

222222
'formtype' => 'SELECT',
223-
'default' => 'DE',
223+
'default' => '$conf["country"]',
224224
'datasource' => array ( 'type' => 'SQL',
225225
'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name',
226226
'keyfield'=> 'iso',

server/lib/classes/monitor_tools.inc.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ public function get_distname() {
149149
return array('name' => $distname, 'version' => $distver, 'id' => $distid, 'baseid' => $distbaseid);
150150
}
151151

152-
/*
153152
//** Email Quota
154153
public function monitorEmailQuota() {
155154
global $conf;
@@ -184,7 +183,6 @@ public function monitorEmailQuota() {
184183
$res['state'] = $state;
185184
return $res;
186185
}
187-
*/
188186

189187
//** Filesystem Quota
190188
public function monitorHDQuota() {

server/mods-available/monitor_core_module.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private function _doMonitor() {
8686
/*
8787
* Calls the single Monitoring steps
8888
*/
89-
// $this->_monitorEmailQuota();
89+
$this->_monitorEmailQuota();
9090
$this->_monitorHDQuota();
9191
$this->_monitorServer();
9292
$this->_monitorOsVer();

0 commit comments

Comments
 (0)