merging pull-request #187, set log format for dovecot in froxlor config and updated German translations

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

templates/misc/configfiles/debian_squeeze/dovecot/etc_dovecot_dovecot.conf

@@ -16,14 +16,30 @@ disable_plaintext_auth = no
 
 protocol imap {
 	mail_plugins = quota imap_quota
+	# IMAP logout format string:
+	#  %i - total number of bytes read from client
+	#  %o - total number of bytes sent to client
+	imap_logout_format = in=%i out=%o
 }
 
 protocol pop3 {
     # leave this uncommented if you are migrating from Courier also see Migration from Courier
     pop3_uidl_format = UID%u-%v
     mail_plugins = quota
-    
+    # POP3 logout format string:
+	# %i - total number of bytes read from client
+	# %o - total number of bytes sent to client
+	# %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)
+	# %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
+	pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s
 }
+
 protocol lda {
     # postmaster is the one in charge of the mail system. MUST be set to a valid address!
     postmaster_address = postmaster@<SERVERNAME>

templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-imap.conf

@@ -18,7 +18,7 @@ protocol imap {
   # IMAP logout format string:
   #  %i - total number of bytes read from client
   #  %o - total number of bytes sent to client
-  #imap_logout_format = bytes=%i/%o
+  imap_logout_format = in=%i out=%o
 
   # Override the IMAP CAPABILITY response. If the value begins with '+',
   # add the given capabilities on top of the defaults (e.g. +XFOO XBAR).

templates/misc/configfiles/debian_wheezy/dovecot/etc_dovecot_conf.d_20-pop3.conf

@@ -70,7 +70,7 @@ protocol pop3 {
   #  %m - number of messages (before deletion)
   #  %s - mailbox size in bytes (before deletion)
   #  %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
-  #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s
+  pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s
 
   # Maximum number of POP3 connections allowed for a user from each IP address.
   # NOTE: The username is compared case-sensitively.

templates/misc/configfiles/freebsd/dovecot/usr_local_etc_dovecot.conf

@@ -50,6 +50,11 @@ protocol imap {
     mail_executable = /usr/local/libexec/dovecot/imap
     imap_max_line_length = 65536
     imap_client_workarounds = delay-newmail outlook-idle netscape-eoh tb-extra-mailbox-sep
+    
+    # IMAP logout format string:
+    #  %i - total number of bytes read from client
+    #  %o - total number of bytes sent to client
+    imap_logout_format = in=%i out=%o
 }
 
 protocol pop3 {
@@ -57,6 +62,19 @@ protocol pop3 {
     mail_executable = /usr/local/libexec/dovecot/pop3
     pop3_uidl_format = %08Xu%08Xv
     pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+    
+    # POP3 logout format string:
+    # %i - total number of bytes read from client
+    # %o - total number of bytes sent to client
+    # %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)
+    # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
+    pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s
 }
 
 protocol lda {

templates/misc/configfiles/freebsd/dovecot2/usr_local_etc_dovecot_dovecot.conf

@@ -126,6 +126,10 @@ protocol imap {
 	mail_plugins = $mail_plugins
 	imap_client_workarounds = delay-newmail tb-extra-mailbox-sep
 	imap_max_line_length = 64 k
+	# IMAP logout format string:
+	#  %i - total number of bytes read from client
+	#  %o - total number of bytes sent to client
+	imap_logout_format = in=%i out=%o
 
 }
 

templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf

@@ -47,11 +47,29 @@ userdb {
 
 protocol imap {
 	mail_plugins = quota imap_quota
+	
+	# IMAP logout format string:
+	#  %i - total number of bytes read from client
+	#  %o - total number of bytes sent to client
+	imap_logout_format = in=%i out=%o
 }
 
 protocol pop3 {
 	mail_plugins = quota
 	pop3_uidl_format = UID%u-%v
+	
+	# POP3 logout format string:
+	# %i - total number of bytes read from client
+	# %o - total number of bytes sent to client
+	# %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)
+	# %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
+	pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s
 }
 
 lda_mailbox_autocreate = yes

templates/misc/configfiles/opensuse_11_x/dovecot/etc_dovecot_dovecot.conf

@@ -16,6 +16,11 @@ disable_plaintext_auth = no
 
 protocol imap {
 	mail_plugins = quota imap_quota
+	
+	# IMAP logout format string:
+	#  %i - total number of bytes read from client
+	#  %o - total number of bytes sent to client
+	imap_logout_format = in=%i out=%o
 }
 
 protocol pop3 {
@@ -23,6 +28,18 @@ protocol pop3 {
     pop3_uidl_format = UID%u-%v
     mail_plugins = quota
     
+    # POP3 logout format string:
+    # %i - total number of bytes read from client
+    # %o - total number of bytes sent to client
+    # %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)
+    # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
+    pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s
 }
 protocol lda {
     # postmaster is the one in charge of the mail system. MUST be set to a valid address!

templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf

@@ -15,6 +15,11 @@ protocol imap {
         mail_plugins = quota imap_quota
         mail_max_userip_connections = 10
         imap_client_workarounds = outlook-idle delay-newmail
+        
+        # IMAP logout format string:
+        #  %i - total number of bytes read from client
+        #  %o - total number of bytes sent to client
+        imap_logout_format = in=%i out=%o
 }
 
 # POP3 configuration
@@ -23,6 +28,19 @@ protocol pop3 {
         pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
         pop3_uidl_format = UID%u-%v
         mail_plugins = quota
+        
+        # POP3 logout format string:
+        # %i - total number of bytes read from client
+        # %o - total number of bytes sent to client
+        # %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)
+        # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
+        pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s
 }
 
 # LDA configuration

templates/misc/configfiles/ubuntu_precise/dovecot/etc_dovecot_conf.d_01_mail_stack_delivery.conf

@@ -13,6 +13,11 @@ protocol imap {
         mail_plugins = quota imap_quota
         mail_max_userip_connections = 10
 	imap_client_workarounds = delay-newmail
+	
+	# IMAP logout format string:
+	#  %i - total number of bytes read from client
+	#  %o - total number of bytes sent to client
+	imap_logout_format = in=%i out=%o
 }
 
 # POP3 configuration
@@ -21,6 +26,19 @@ protocol pop3 {
         pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
 	pop3_uidl_format = UID%u-%v
 	mail_plugins = quota
+	
+	# POP3 logout format string:
+	# %i - total number of bytes read from client
+	# %o - total number of bytes sent to client
+	# %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)
+	# %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly
+	pop3_logout_format = in=%i out=%o top=%t/%p retr=%r/%b del=%d/%m size=%s
 }
 
 # LDA configuration
@@ -50,4 +68,3 @@ service auth {
     group = postfix
   }
 }
-