diff --git a/CHANGELOG.md b/CHANGELOG.md index d6c43599..f78309f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 7.0.2 + +* Fix: Letsencrypt certificate import procedure was not working on server that had never installed Prosody. Adding `prosody_user` in the Prosody configuration file to fix this. Updating the procedure: the `chown` is no more needed in `/etc/letsencrypt/renewal-hooks/deploy/prosody.sh`. + ## 7.0.1 * Fix: trying to connect to a remote instance using direct s2s won't work if local instance has not the feature enabled, and if the remote instance does not know the local one. So using Websocket S2S in such case (that embed a discovery mecanism). diff --git a/package-lock.json b/package-lock.json index a116a2c5..450afd9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "peertube-plugin-livechat", - "version": "7.0.1", + "version": "7.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "peertube-plugin-livechat", - "version": "7.0.1", + "version": "7.0.2", "license": "AGPL-3.0", "dependencies": { "async": "^3.2.2", diff --git a/package.json b/package.json index 46d06328..bd03e2c9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "peertube-plugin-livechat", "description": "PeerTube plugin livechat: offers a way to embed a chat system into Peertube.", - "version": "7.0.1", + "version": "7.0.2", "license": "AGPL-3.0", "author": { "name": "John Livingston", diff --git a/server/lib/prosody/config/content.ts b/server/lib/prosody/config/content.ts index ea6c6610..a3831f12 100644 --- a/server/lib/prosody/config/content.ts +++ b/server/lib/prosody/config/content.ts @@ -1,5 +1,6 @@ import type { ProsodyFilePaths } from './paths' import type { ExternalComponent } from './components' +import { userInfo } from 'os' type ConfigEntryValue = boolean | number | string | ConfigEntryValue[] @@ -154,6 +155,8 @@ class ProsodyConfigContent { this.global.set('allow_registration', false) this.global.set('admins', []) + this.global.set('prosody_user', userInfo().username) + this.global.set('pidfile', this.paths.pid) this.global.set('plugin_paths', [this.paths.modules]) this.global.set('data_path', this.paths.data) diff --git a/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md b/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md index 802d27d2..fbcafedd 100644 --- a/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md +++ b/support/documentation/content/documentation/admin/advanced/xmpp_clients.en.md @@ -180,8 +180,6 @@ We will create a file `/etc/letsencrypt/renewal-hooks/deploy/prosody.sh` contain --config /var/www/peertube/storage/plugins/data/peertube-plugin-livechat/prosody/prosody.cfg.lua \ cert import \ room.your_instance.tld your_instance.tld /etc/letsencrypt/live - -chown peertube:peertube /var/www/peertube/storage/plugins/data/peertube-plugin-livechat/prosody/certs/* ``` Then we ask to generate the certificate: diff --git a/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md b/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md index 8e0517e3..dd2632e2 100644 --- a/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md +++ b/support/documentation/content/documentation/admin/advanced/xmpp_clients.fr.md @@ -190,8 +190,6 @@ On va créer un fichier `/etc/letsencrypt/renewal-hooks/deploy/prosody.sh` conte --config /var/www/peertube/storage/plugins/data/peertube-plugin-livechat/prosody/prosody.cfg.lua \ cert import \ room.votre_instance.tld votre_instance.tld /etc/letsencrypt/live - -chown peertube:peertube /var/www/peertube/storage/plugins/data/peertube-plugin-livechat/prosody/certs/* ``` Puis on demande à générer le certificat :