From 295a55c9f6cf4fa25b378f41188a023cc8c3049a Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Fri, 16 Apr 2021 15:13:46 +0200
Subject: [PATCH] Port configuration.

---
 server/lib/prosody/config.ts | 24 +++++++++++++++++-------
 server/lib/settings.ts       | 11 +++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/server/lib/prosody/config.ts b/server/lib/prosody/config.ts
index d4cda1a1..1aa15aa7 100644
--- a/server/lib/prosody/config.ts
+++ b/server/lib/prosody/config.ts
@@ -94,15 +94,30 @@ async function getProsodyConfig (options: RegisterServerOptions): Promise<Prosod
   const logger = options.peertubeHelpers.logger
   logger.debug('Calling getProsodyConfig')
 
-  const port = '5280'
+  const port = (await options.settingsManager.getSetting('prosody-port') as string) || '52800'
+  if (!/^\d+$/.test(port)) {
+    throw new Error('Invalid port')
+  }
   const peertubeDomain = 'localhost'
   const paths = await getProsodyFilePaths(options)
   const logMode: LogMode = 'info'
   const content = `
 
-admins = { }
+daemonize = false
+pidfile = "${paths.pid}"
 plugin_paths = { }
 data_path = "${paths.data}"
+interfaces = { "127.0.0.1" }
+c2s_ports = { }
+c2s_interfaces = { "127.0.0.1" }
+s2s_ports = { }
+s2s_interfaces = { "127.0.0.1" }
+http_ports = { "${port}" }
+http_interfaces = { "127.0.0.1" }
+https_ports = { }
+https_interfaces = { "127.0.0.1" }
+
+admins = { }
 
 modules_enabled = {
   "roster"; -- Allow users to have a roster. Recommended ;)
@@ -123,10 +138,6 @@ modules_disabled = {
 
 allow_registration = false
 
-daemonize = false
-
-pidfile = "${paths.pid}"
-
 c2s_require_encryption = false
 
 archive_expires_after = "1w" -- Remove archived messages after 1 week
@@ -143,7 +154,6 @@ cross_domain_bosh = false
 consider_bosh_secure = true
 cross_domain_websocket = false
 consider_websocket_secure = true
-https_ports = { }
 
 VirtualHost "localhost"
   trusted_proxies = { "127.0.0.1", "::1" }
diff --git a/server/lib/settings.ts b/server/lib/settings.ts
index 8e040444..e2b29970 100644
--- a/server/lib/settings.ts
+++ b/server/lib/settings.ts
@@ -81,6 +81,17 @@ export function initSettings (options: RegisterServerOptions): void {
     descriptionHTML: 'If checked, this will use a builtin XMPP server. This is the recommanded setup.'
   })
 
+  registerSetting({
+    name: 'prosody-port',
+    label: 'Builtin prosody: Prosody port',
+    type: 'input',
+    default: '52800',
+    private: true,
+    descriptionHTML: 'The port that will be used by the builtin Prosody server.<br>' +
+    'Change it if this port is already in use on your server.<br>' +
+    'You can close this port on your firewall, it will not be accessed from the outer world.'
+  })
+
   registerSetting({
     name: 'chat-use-builtin',
     label: 'Use builtin ConverseJS',