From 0ca6bcf6d6fe47371685ef69d9f3c5e0f154ec0e Mon Sep 17 00:00:00 2001 From: VC Date: Wed, 11 Dec 2019 22:33:56 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20d=E2=80=99une=20coquille=20dans=20?= =?UTF-8?q?la=20configuration=20:=20si=20le=20http=5Fupload=20est=20activ?= =?UTF-8?q?=C3=A9=20dans=20les=20modules,=20il=20est=20activ=C3=A9=20par?= =?UTF-8?q?=20d=C3=A9faut=20sur=20tous=20les=20vhosts=20prosody,=20y=20com?= =?UTF-8?q?pris=20le=20https=20(5281).=20Du=20coup=20Conversations=20d?= =?UTF-8?q?=C3=A9tecte=20que=20le=20http=5Fupload=20est=20activ=C3=A9=20po?= =?UTF-8?q?ur=20un=20host=20en=20https=20et=20donc=20le=20privil=C3=A9gie?= =?UTF-8?q?=20par=20rapport=20au=20h=C3=B4te=20http=20qui=20est=20configur?= =?UTF-8?q?=C3=A9=20(!).=20Seul=20moyen=20de=20s=E2=80=99en=20sortir=20:?= =?UTF-8?q?=20d=C3=A9sactiv=C3=A9=20compl=C3=A8tement=20le=20http=5Fupload?= =?UTF-8?q?=20dans=20les=20modules=20et=20bourrer=20le=20reste.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- roles/xmpp/files/prosody.cfg.lua | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/roles/xmpp/files/prosody.cfg.lua b/roles/xmpp/files/prosody.cfg.lua index 2748ca7..aec199e 100644 --- a/roles/xmpp/files/prosody.cfg.lua +++ b/roles/xmpp/files/prosody.cfg.lua @@ -63,7 +63,7 @@ modules_enabled = { -- HTTP modules "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - "http_upload"; -- Enable HTTP upload XEP-0353 + -- "http_upload"; -- Enable HTTP upload XEP-0353 --"http_files"; -- Serve static files from a directory over HTTP -- Other specific functionality @@ -202,11 +202,11 @@ VirtualHost "libertus.eu" ---Set up a MUC (multi-user chat) room server on conference.example.com: Component "conference.libertus.eu" "muc" -restrict_room_creation = "local" -muc_room_default_public = false -muc_room_default_persistent = true -muc_room_default_members_only = true -muc_room_default_public_jids = true + restrict_room_creation = "local" + muc_room_default_public = false + muc_room_default_persistent = true + muc_room_default_members_only = true + muc_room_default_public_jids = true -- Set up a SOCKS5 bytestream proxy for server-proxied file transfers: --Component "proxy.example.com" "proxy65" @@ -221,10 +221,11 @@ muc_room_default_public_jids = true -- component_secret = "password" Component "upload.libertus.eu" "http_upload" -http_external_url = "https://upload.libertus.eu" -http_upload_file_size_limit = 10 * 1024 * 1024 -http_upload_expire_after = 60 * 60 * 24 * 7 -http_upload_allowed_file_types = { "image/*", "text/plain" } + http_host = "upload.libertus.eu" + http_external_url = "https://upload.libertus.eu/" + http_upload_file_size_limit = 10 * 1024 * 1024 + http_upload_expire_after = 60 * 60 * 24 * 7 + http_upload_allowed_file_types = { "image/*", "text/plain" } ------ Additional config files ------ -- For organizational purposes you may prefer to add VirtualHost and