Skip to content
Permalink
Browse files

installer: remove duplicate defaults from sample config

The sample config is supposed to list the defaults as comments,
in the style of "#name=value". That renders the # Default:
line actually redundant.

References: KF-1292
  • Loading branch information...
jengelh committed Apr 18, 2018
1 parent 3fad93e commit aa686ab1101796b906f96f3a9eb65c873ab36a38
Showing with 14 additions and 39 deletions.
  1. +2 −5 installer/linux/dagent.cfg
  2. +8 −26 installer/linux/server.cfg
  3. +4 −8 installer/linux/spooler.cfg
@@ -20,14 +20,13 @@
# DAGENT LOG SETTINGS

# Logging method (syslog, file)
#log_method = file
#log_method = auto

# Loglevel (0(none), 1(crit), 2(err), 3(warn), 4(notice), 5(info), 6(debug))
#log_level = 3

# Logfile for log_method = file, use '-' for stderr
# Default: -
#log_file = /var/log/kopano/dagent.log
#log_file = -

# Log timestamp - prefix each log line with timestamp in 'file' logging mode
#log_timestamp = yes
@@ -131,12 +130,10 @@

# Enable the addition of X-Kopano-Rule-Action headers on messages
# that have been forwarded or replied by a rule.
# Default: yes
#set_rule_headers = yes

# Enable this option to prevent rules to cause a loop. An e-mail can only be forwarded
# once. When this option is enabled, the set_rule_headers option must also be enabled.
# Default: no
#no_double_forward = no

# Some emails do not contain any charset information, or may wrongly specify
@@ -28,8 +28,7 @@ server_listen = *:236
#server_pipe_priority = /var/run/kopano/prio.sock

# Name for identifying the server in a multi-server environment
# Default: (empty)
#server_name = Kopano
#server_name =

# Override the hostname of this server, used by Kerberos SSO if enabled
#server_hostname =
@@ -66,8 +65,7 @@ local_admin_users = root kopano

# Use given allocator library. Values like libtcmalloc.so.4,
# libtcmalloc_minimal.so.4 and libjemalloc.so.2 would work.
# Default: libtcmalloc_minimal.so.4
#allocator_library =
#allocator_library = libtcmalloc_minimal.so.4

# create memory coredumps upon crash [no, systemdefault, yes]
#coredump_enabled = systemdefault
@@ -86,11 +84,10 @@ local_admin_users = root kopano
# LOG SETTINGS

# Logging method (syslog, file), syslog facility is 'mail'
#log_method = file
#log_method = auto

# Logfile (for log_method = file, '-' for stderr)
# Default: -
#log_file = /var/log/kopano/server.log
#log_file = -

# Loglevel (0(none), 1(crit), 2(err), 3(warn), 4(notice), 5(info), 6(debug))
#log_level = 3
@@ -173,28 +170,22 @@ local_admin_users = root kopano
# is using another port, you can specify the port with hostname:port.
#attachment_s3_hostname = s3-eu-west-1.amazonaws.com

# The region where the bucket is located
# Default: (empty)
#attachment_s3_region = eu-west-1
# The region where the bucket is located, e.g. "eu-west-1"
#attachment_s3_region =

# The protocol that should be used to connect to S3, 'http' or 'https' (preferred)
# Default: (empty)
#attachment_s3_protocol = https
#attachment_s3_protocol =

# The URL style of the bucket, "virtualhost" or "path"
# Default: (empty)
#attachment_s3_uristyle = virtualhost
#attachment_s3_uristyle =

# The access key id of your S3 account
# Default: (empty)
#attachment_s3_accesskeyid =

# The secret access key of your S3 account
# Default: (empty)
#attachment_s3_secretaccesskey =

# The bucket name in which the files will be stored
# Default: (empty)
#attachment_s3_bucketname =

##############################################################
@@ -239,28 +230,22 @@ local_admin_users = root kopano
# THREAD SETTINGS

# Number of server threads
# default: 8
#threads = 8

# Watchdog frequency. The number of watchdog checks per second.
# default: 1
#watchdog_frequency = 1

# Watchdog max age. The maximum age in ms of a task before a
# new thread is started.
# default: 500
#watchdog_max_age = 500

# SOAP recv timeout value (time between requests)
# default: 5
#server_recv_timeout = 5

# SOAP read timeout value (time during requests)
# default: 60
#server_read_timeout = 60

# SOAP send timeout value
# default: 60
#server_send_timeout = 60

##############################################################
@@ -395,7 +380,6 @@ local_admin_users = root kopano
# %u Username
# %f Full name
# %c Tenant's name
# default: %f
#storename_format = %f

# Loginname format (for Multi-tenancy installations)
@@ -411,7 +395,6 @@ local_admin_users = root kopano
# %u Username
# %c Teantname
#
# default: %u
#loginname_format = %u

# Everyone is a special internal group, which contains every user and group
@@ -438,7 +421,6 @@ local_admin_users = root kopano
#search_timeout = 10

# Allow enhanced ICS operations to speedup synchronization with cached profiles.
# default: yes
#enable_enhanced_ics = yes

# SQL Procedures allow for some optimized queries when streaming with enhanced ICS.
@@ -34,14 +34,13 @@
# SPOOLER LOG SETTINGS

# Logging method (syslog, file)
#log_method = file
#log_method = auto

# Loglevel (0(none), 1(crit), 2(err), 3(warn), 4(notice), 5(info), 6(debug))
#log_level = 3

# Logfile for log_method = file, use '-' for stderr
# Default: -
#log_file = /var/log/kopano/spooler.log
#log_file = -

# Log timestamp - prefix each log line with timestamp in 'file' logging mode
#log_timestamp = yes
@@ -69,22 +68,19 @@
# SPOOLER THREAD SETTINGS

# Maximum number of threads used to send outgoing messages
# Default: 5
#max_threads = 5

##############################################################
# SPOOLER FAXING SETTINGS

# When sending an email that must go to a fax address, the address
# will be rewritten to <phonenumber>@<fax_domain>
# Default: (empty)
#fax_domain = fax.local
#fax_domain =

# If the received number starts with a '+', it will be replaced by
# the fax_international value.
# e.g. +3112345678@fax.local will be rewritten to 003112345678@fax.local
# Default: +
#fax_international = 00
#fax_international = +

##############################################################
# SPOOLER DELEGATE SETTINGS

0 comments on commit aa686ab

Please sign in to comment.
You can’t perform that action at this time.