changeset 3301:f69233c3e0c0

merge
author Kim Alvefur <zash@zash.se>
date Sat, 08 Sep 2018 11:37:38 +0200
parents 2c62fda477a5 (diff) 65dd8ebbd82c (current diff)
children 617c65ef1a70
files
diffstat 2 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mod_auth_dovecot/README.markdown	Fri Sep 07 20:25:07 2018 -0400
+++ b/mod_auth_dovecot/README.markdown	Sat Sep 08 11:37:38 2018 +0200
@@ -32,14 +32,16 @@
 the *socket listen* section of /etc/dovecot/dovecot.conf, and match the
 socket path in Prosody's dovecot\_auth\_socket setting.
 
-    socket listen {
-      ...
-      client {
-        path = /var/spool/prosody/private/auth-client
-          mode = 0660
-          user = prosody
-          group = prosody
-      }
+    service auth {
+        socket listen {
+            client {
+                path = /var/spool/prosody/private/auth-client
+                    mode = 0660
+                    user = prosody
+                    group = prosody
+            }
+        }
+    }
 
 Make sure the socket directories exist and are owned by the Prosody
 user.
--- a/mod_muc_badge/README.markdown	Fri Sep 07 20:25:07 2018 -0400
+++ b/mod_muc_badge/README.markdown	Sat Sep 08 11:37:38 2018 +0200
@@ -20,7 +20,6 @@
 
   Option             Type     Default
   ------------------ -------- --------------------------
-  `badge_label`      string   `"Chatroom"`
   `badge_count`      string   `"%d online"`
   `badge_template`   string   A SVG image (see source)