From a6a973c03431448e839b6e5be85ac07823ddb37b Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Mon, 9 Sep 2019 19:09:44 +0200 Subject: [PATCH] prosody: make it work with buster --- roles/prosody/tasks/main.yml | 10 +- roles/prosody/templates/prosody.cfg.lua.j2 | 129 ++++++++++++++------- 2 files changed, 96 insertions(+), 43 deletions(-) diff --git a/roles/prosody/tasks/main.yml b/roles/prosody/tasks/main.yml index caa1162..78125ba 100644 --- a/roles/prosody/tasks/main.yml +++ b/roles/prosody/tasks/main.yml @@ -1,10 +1,16 @@ --- -- name: Install dependencies +- name: Enable backports + apt_repository: repo='deb http://deb.debian.org/debian buster-backports main' + +# debian is too stupid to fix this in stable: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=914536 +- name: Install lua-cyrussasl from backports + apt: name=lua-cyrussasl default_release=buster-backports + +- name: Install prosody apt: name={{ item }} with_items: - prosody - - lua-cyrussasl - libsasl2-modules-ldap - sasl2-bin diff --git a/roles/prosody/templates/prosody.cfg.lua.j2 b/roles/prosody/templates/prosody.cfg.lua.j2 index aa2cd9f..8c68db3 100644 --- a/roles/prosody/templates/prosody.cfg.lua.j2 +++ b/roles/prosody/templates/prosody.cfg.lua.j2 @@ -1,8 +1,11 @@ +-- Prosody Configuration File +-- -- Information on configuring Prosody can be found on our --- website at http://prosody.im/doc/configure +-- website at https://prosody.im/doc/configure -- -- Tip: You can check that the syntax of this file is correct --- when you have finished by running: luac -p prosody.cfg.lua +-- when you have finished by running this command: +-- prosodyctl check config -- If there are any errors, it will let you know what and where -- they are, otherwise it will keep quiet. @@ -13,17 +16,24 @@ -- This is a (by default, empty) list of accounts that are admins -- for the server. Note that you must create the accounts separately --- (see http://prosody.im/doc/creating_accounts for info) +-- (see https://prosody.im/doc/creating_accounts for info) -- Example: admins = { "user1@example.com", "user2@example.net" } admins = { "{{ prosody_admin }}" } -- Enable use of libevent for better performance under high load --- For more information see: http://prosody.im/doc/libevent +-- For more information see: https://prosody.im/doc/libevent use_libevent = true; +-- Prosody will always look in its source directory for modules, but +-- this option allows you to specify additional locations where Prosody +-- will look for modules first. For community modules, see https://modules.prosody.im/ +-- For a local administrator it's common to place local modifications +-- under /usr/local/ hierarchy: +plugin_paths = { "/usr/local/lib/prosody/modules" } + -- This is the list of modules Prosody will load on startup. -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too. --- Documentation on modules can be found at: http://prosody.im/doc/modules +-- Documentation for bundled modules can be found at: https://prosody.im/doc/modules modules_enabled = { -- Generally required @@ -34,20 +44,21 @@ modules_enabled = { "disco"; -- Service discovery -- Not essential, but recommended + "carbons"; -- Keep multiple clients in sync + "pep"; -- Enables users to publish their avatar, mood, activity, playing music and more "private"; -- Private XML storage (for room bookmarks, etc.) - "vcard"; -- Allow users to set vCards - - -- These are commented by default as they have a performance impact - --"privacy"; -- Support privacy lists - --"compression"; -- Stream compression (Debian: requires lua-zlib module to work) + "blocklist"; -- Allow users to block communications with other users + "vcard4"; -- User profiles (stored in PEP) + "vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard -- Nice to have "version"; -- Replies to server version requests "uptime"; -- Report how long server has been running "time"; -- Let others know the time here on this server "ping"; -- Replies to XMPP pings with pongs - "pep"; -- Enables users to publish their mood, activity, playing music and more "register"; -- Allow users to register on this server using a client and change passwords + "mam"; -- Store messages in an archive and allow users to access it + --"csi_simple"; -- Simple Mobile optimizations -- Admin interfaces "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands @@ -55,27 +66,29 @@ modules_enabled = { -- HTTP modules "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" + "websocket"; -- XMPP over WebSockets --"http_files"; -- Serve static files from a directory over HTTP -- Other specific functionality "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + --"limits"; -- Enable bandwidth limiting for XMPP connections --"groups"; -- Shared roster support + --"server_contact_info"; -- Publish contact information for this service "announce"; -- Send announcement to all online users --"welcome"; -- Welcome users who register accounts --"watchregistrations"; -- Alert admins of registrations --"motd"; -- Send a message to users when they log in --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots. - "blocking"; -- XEP-0191: Blocking Command - "privacy"; -- blocking: dependency + --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use + + -- User experience "smacks"; -- XEP-0198: Reliability and fast reconnects for XMPP - "carbons"; -- XEP-0280: Message Carbons - "mam"; -- XEP-0313: Message Archive Management "csi"; -- XEP-0352: Client State Indication "throttle_presence"; -- CSI: suppress presence updates "filter_chatstates"; -- CSI: remove chat states (Someone is typing...) "cloud_notify"; -- XEP-0357: Push Notifications "http_upload"; -- XEP-0363: HTTP File Upload -}; +} -- These modules are auto-loaded, but should you want -- to disable them then uncomment them here: @@ -83,22 +96,22 @@ modules_disabled = { -- "offline"; -- Store offline messages -- "c2s"; -- Handle client connections -- "s2s"; -- Handle server-to-server connections -}; +} -- Disable account creation by default, for security --- For more information see http://prosody.im/doc/creating_accounts -allow_registration = false; +-- For more information see https://prosody.im/doc/creating_accounts +allow_registration = false -- Debian: --- send the server to background. +-- Do not send the server to background, either systemd or start-stop-daemon take care of that. -- -daemonize = true; +daemonize = false; -- Debian: --- Please, don't change this option since /var/run/prosody/ +-- Please, don't change this option since /run/prosody/ -- is one of the few directories Prosody is allowed to write to -- -pidfile = "/var/run/prosody/prosody.pid"; +pidfile = "/run/prosody/prosody.pid"; -- These are the SSL/TLS-related settings. If you don't want -- to use SSL/TLS, you may comment or remove this @@ -112,38 +125,38 @@ ssl = { c2s_require_encryption = true +-- Force servers to use encrypted connections? This option will +-- prevent servers from authenticating unless they are using encryption. + +s2s_require_encryption = true + -- Force certificate authentication for server-to-server connections? --- This provides ideal security, but requires servers you communicate --- with to support encryption AND present valid, trusted certificates. --- NOTE: Your version of LuaSec must support certificate verification! --- For more information see http://prosody.im/doc/s2s#security s2s_secure_auth = false --- Many servers don't support encryption or have invalid or self-signed --- certificates. You can list domains here that will not be required to --- authenticate using certificates. They will be authenticated using DNS. +-- Some servers have invalid or self-signed certificates. You can list +-- remote domains here that will not be required to authenticate using +-- certificates. They will be authenticated using DNS instead, even +-- when s2s_secure_auth is enabled. ---s2s_insecure_domains = { "gmail.com" } +--s2s_insecure_domains = { "insecure.example" } --- Even if you leave s2s_secure_auth disabled, you can still require valid +-- Even if you disable s2s_secure_auth, you can still require valid -- certificates for some domains by specifying a list here. --s2s_secure_domains = { "jabber.org" } -- Select the authentication backend to use. The 'internal' providers -- use Prosody's configured data storage to store the authentication data. --- To allow Prosody to offer secure authentication mechanisms to clients, the --- default provider stores passwords in plaintext. If you do not trust your --- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed --- for information about using the hashed backend. -authentication = "internal_plain" +-- TODO This setting needs testing, old value retained as comment +--authentication = "internal_plain" +authentication = "internal_hashed" -- Select the storage backend to use. By default Prosody uses flat files -- in its configured data directory, but it also supports more backends -- through modules. An "sql" backend is included by default, but requires --- additional dependencies. See http://prosody.im/doc/storage for more info. +-- additional dependencies. See https://prosody.im/doc/storage for more info. --storage = "sql" -- Default is "internal" (Debian: "sql" requires one of the -- lua-dbi-sqlite3, lua-dbi-mysql or lua-dbi-postgresql packages to work) @@ -153,8 +166,20 @@ authentication = "internal_plain" --sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } --sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" } + +-- Archiving configuration +-- If mod_mam is enabled, Prosody will store a copy of every message. This +-- is used to synchronize conversations between multiple clients, even if +-- they are offline. This setting controls how long Prosody will keep +-- messages in the archive before removing them. + +archive_expires_after = "2w" -- Remove archived messages after 2 weeks + +-- You can also configure messages to be stored in-memory only. For more +-- archiving options, see https://prosody.im/doc/modules/mod_mam + -- Logging configuration --- For advanced logging see http://prosody.im/doc/logging +-- For advanced logging see https://prosody.im/doc/logging -- -- Debian: -- Logs info and higher to /var/log @@ -167,9 +192,29 @@ log = { { levels = { "error" }; to = "syslog"; }; } +-- Uncomment to enable statistics +-- For more info see https://prosody.im/doc/statistics +-- statistics = "internal" + +-- Certificates +-- Every virtual host and component needs a certificate so that clients and +-- servers can securely verify its identity. Prosody will automatically load +-- certificates/keys from the directory specified here. +-- For more information, including how to use 'prosodyctl' to auto-import certificates +-- (from e.g. Let's Encrypt) see https://prosody.im/doc/certificates + +-- Location of directory to find certificates in (relative to main config file): +certificates = "certs" + +-- HTTPS currently only supports a single certificate, specify it here: +--https_certificate = "/etc/prosody/certs/localhost.crt" + ----------- Virtual hosts ----------- -- You need to add a VirtualHost entry for each domain you wish Prosody to serve. -- Settings under each VirtualHost entry apply *only* to that host. +-- It's customary to maintain VirtualHost entries in separate config files +-- under /etc/prosody/conf.d/ directory. Examples of such config files can +-- be found in /etc/prosody/conf.avail/ directory. VirtualHost "{{ prosody_domain }}" @@ -189,10 +234,12 @@ VirtualHost "{{ prosody_domain }}" ------ Components ------ -- You can specify components to add hosts that provide special services, -- like multi-user conferences, and transports. --- For more information on components, see http://prosody.im/doc/components +-- For more information on components, see https://prosody.im/doc/components ---Set up a MUC (multi-user chat) room server on conference.example.com: --Component "conference.example.com" "muc" +--- Store MUC messages in an archive and allow users to access it +--modules_enabled = { "muc_mam" } -- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: Component "proxy.{{ prosody_domain }}" "proxy65" @@ -203,7 +250,7 @@ Component "proxy.{{ prosody_domain }}" "proxy65" -- -- External components allow adding various services, such as gateways/ -- transports to other networks like ICQ, MSN and Yahoo. For more info --- see: http://prosody.im/doc/components#adding_an_external_component +-- see: https://prosody.im/doc/components#adding_an_external_component -- --Component "gateway.example.com" -- component_secret = "password"