From d1cd0191293f6fded28348b116d616c27c01d4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@servercow.de>
Date: Fri, 31 Aug 2018 09:54:00 +0200
Subject: [PATCH] Add pflogsumm

---
 docs/{client => }/client.md   |  0
 docs/{client => }/clients.js  |  0
 docs/u_e-dovecot-any_acl.md   | 30 ++++++++++++++++++++++++++++++
 docs/u_e-postfix-pflogsumm.md |  7 +++++++
 mkdocs.yml                    |  4 +++-
 5 files changed, 40 insertions(+), 1 deletion(-)
 rename docs/{client => }/client.md (100%)
 rename docs/{client => }/clients.js (100%)
 create mode 100644 docs/u_e-dovecot-any_acl.md
 create mode 100644 docs/u_e-postfix-pflogsumm.md

diff --git a/docs/client/client.md b/docs/client.md
similarity index 100%
rename from docs/client/client.md
rename to docs/client.md
diff --git a/docs/client/clients.js b/docs/clients.js
similarity index 100%
rename from docs/client/clients.js
rename to docs/clients.js
diff --git a/docs/u_e-dovecot-any_acl.md b/docs/u_e-dovecot-any_acl.md
new file mode 100644
index 000000000..c93198174
--- /dev/null
+++ b/docs/u_e-dovecot-any_acl.md
@@ -0,0 +1,30 @@
+On August the 17th, we disabled the possibility to share with "any" or "all authenticated users" in Dovecot by default.
+
+## Re-enable "any" ACL in Dovecot
+
+Open `data/conf/dovecot/dovecot.conf`:
+```
+# Allow "any" or "authenticated" to be used in ACLs
+#acl_anyone = allow
+```
+Remove "#" from "acl_anyone" and restart Dovecot by running `docker-compose restart dovecot-mailcow`.
+
+## Re-enable "any" ACL field in SOGo
+
+We have not yet made it an optional setting. But you can still rebuild sogo-mailcow with a slight change to 
+
+Open `data/Dockerfiles/sogo/bootstrap-sogo.sh` and comment out the following code:
+
+```
+if patch -sfN --dry-run /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff > /dev/null; then
+  patch /usr/lib/GNUstep/SOGo/Templates/UIxAclEditor.wox < /acl.diff;
+fi
+```
+
+Rebuild sogo-mailcow and update the stack:
+
+```
+docker-compose build sogo-mailcow
+docker-compose up -d
+```
+
diff --git a/docs/u_e-postfix-pflogsumm.md b/docs/u_e-postfix-pflogsumm.md
new file mode 100644
index 000000000..647a76bdd
--- /dev/null
+++ b/docs/u_e-postfix-pflogsumm.md
@@ -0,0 +1,7 @@
+To use pflogsumm with the default logging driver, we need to query postfix-mailcow via docker logs and pipe the output to pflogsumm:
+
+```
+docker logs --since 24h $(docker ps -qf name=postfix-mailcow) | pflogsumm
+```
+
+The above log output is limited to the past 24 hours.
diff --git a/mkdocs.yml b/mkdocs.yml
index cb5e21198..60559feb5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -60,7 +60,9 @@ pages:
       - 'Anonymize Headers': 'u_e-postfix-anonym_headers.md'
       - 'Disable Sender Addresses Verification': 'u_e-postfix-disable_sender_verification.md'
       - 'Max. message size (attachment size)': 'u_e-postfix-attachment_size.md'
+      - 'Statistics with pflogsumm': 'u_e-postfix-pflogsumm.md'
   - 'Dovecot':
+      - "(Re-)Enable any and all authenticated ACL settings": 'u_e-dovecot-any_acl.md'
       - "Expunge a User's Mails": 'u_e-dovecot-expunge.md'
       - 'More Examples with DOVEADM': 'u_e-dovecot-more.md'
       - 'Move vmail volume': 'u_e-dovecot-vmail-volume.md' 
@@ -77,7 +79,7 @@ pages:
   - 'Adjust Service Configurations': 'u_e-change_config.md'
   - 'Deinstall': 'u_e-deinstall.md'
 - 'Client Configuration':
-  - 'Overview': 'client/client.md'
+  - 'Overview': 'client.md'
   - 'Android': 'client/client-android.md'
   - 'Apple macOS / iOS': 'client/client-apple.md'
   - 'eM Client': 'client/client-emclient.md'