← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dovecot/utopic-proposed

« back to all changes in this revision

Viewing changes to src/replication/replicator/replicator-settings.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (4.1.35 sid)
  • Revision ID: package-import@ubuntu.com-20140108093549-i72o93pux8p0dlaf
Tags: 1:2.2.9-1ubuntu1
* Merge from Debian unstable, remaining changes:
  + Add mail-stack-delivery package:
    - Update d/rules
    - d/control: convert existing dovecot-postfix package to a dummy
      package and add new mail-stack-delivery package.
    - Update maintainer scripts.
    - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
    - d/mail-stack-delivery.preinst: Move previously installed backups and
      config files to a new package namespace.
    - d/mail-stack-delivery.prerm: Added to handle downgrades.
  + Use Snakeoil SSL certificates by default:
    - d/control: Depend on ssl-cert.
    - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - d/dovecot-core.ufw.profile: new ufw profile.
    - d/rules: install profile in dovecot-core.
    - d/control: dovecot-core - suggest ufw.
  + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
  + Add apport hook:
    - d/rules, d/source_dovecot.py
  + Add upstart job:
    - d/rules, d/dovecot-core.dovecot.upstart, d/control,
      d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
      d/dovecot-pop3d.{postinst, postrm, prerm}.
      d/mail-stack-deliver.postinst: Convert init script to upstart.
  + Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.
* Dropped changes, included in Debian:
  - Update Dovecot name to reflect distribution in login greeting.
  - Update Drac plugin for >= 2.0.0 support.
* d/control: Drop dovecot-postfix package as its no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/replication/replicator/replicator-settings.c
1
 
/* Copyright (c) 2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "buffer.h"
8
8
 
9
9
/* <settings checks> */
10
10
static struct file_listener_settings replicator_unix_listeners_array[] = {
11
 
        { "replicator", 0600, "$default_internal_user", "" }
 
11
        { "replicator", 0600, "$default_internal_user", "" },
 
12
        { "replicator-doveadm", 0, "$default_internal_user", "" }
12
13
};
13
14
static struct file_listener_settings *replicator_unix_listeners[] = {
14
 
        &replicator_unix_listeners_array[0]
 
15
        &replicator_unix_listeners_array[0],
 
16
        &replicator_unix_listeners_array[1]
15
17
};
16
18
static buffer_t replicator_unix_listeners_buf = {
17
19
        replicator_unix_listeners, sizeof(replicator_unix_listeners), { 0, }
35
37
        .process_limit = 1,
36
38
        .client_limit = 0,
37
39
        .service_count = 0,
38
 
        .idle_kill = -1U,
 
40
        .idle_kill = UINT_MAX,
39
41
        .vsz_limit = (uoff_t)-1,
40
42
 
41
43
        .unix_listeners = { { &replicator_unix_listeners_buf,
51
53
static const struct setting_define replicator_setting_defines[] = {
52
54
        DEF(SET_STR, auth_socket_path),
53
55
        DEF(SET_STR, doveadm_socket_path),
 
56
        DEF(SET_STR, replication_dsync_parameters),
54
57
 
55
58
        DEF(SET_TIME, replication_full_sync_interval),
56
59
        DEF(SET_UINT, replication_max_conns),
61
64
const struct replicator_settings replicator_default_settings = {
62
65
        .auth_socket_path = "auth-userdb",
63
66
        .doveadm_socket_path = "doveadm-server",
 
67
        .replication_dsync_parameters = "-d -N -l 30 -U",
64
68
 
65
 
        .replication_full_sync_interval = 60*60*12,
 
69
        .replication_full_sync_interval = 60*60*24,
66
70
        .replication_max_conns = 10
67
71
};
68
72