summaryrefslogtreecommitdiff
path: root/ejabberd/ejabberd.yml.diff
blob: b99c6c83354687b2893fa9ffe554df918c3e93cc (plain)
  1. --- a/ejabberd.yml
  2. +++ b/ejabberd.yml
  3. @@ -2,6 +2,8 @@
  4.  ###' ejabberd configuration file
  5. ###
  6. ###
  7. +include_config_file:
  8. + "/etc/local-COMMON/ejabberd/prepend.yml": []
  9. ### The parameters used in this configuration file are explained in more detail
  10. ### in the ejabberd Installation and Operation Guide.
  11. @@ -168,23 +170,11 @@
  12. ## port: 4560
  13. ## module: ejabberd_xmlrpc
  14. ## access_commands: {}
  15. - -
  16. - port: 5280
  17. - ip: "::"
  18. - module: ejabberd_http
  19. - request_handlers:
  20. - "/websocket": ejabberd_http_ws
  21. - ## "/pub/archive": mod_http_fileserver
  22. - web_admin: true
  23. - http_bind: true
  24. - ## register: true
  25. - ## captcha: true
  26. - tls: true
  27. - certfile: "/etc/ejabberd/ejabberd.pem"
  28. ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text
  29. ## password storage (see auth_password_format option).
  30. -disable_sasl_mechanisms: "digest-md5"
  31. +disable_sasl_mechanisms:
  32. + - "digest-md5"
  33. ###. ==================
  34. ###' S2S GLOBAL OPTIONS
  35. @@ -685,6 +675,8 @@
  36. allow_contrib_modules: true
  37. +include_config_file:
  38. + "/etc/local-COMMON/ejabberd/append.yml": []
  39. ###.
  40. ###'
  41. ### Local Variables: