From a2865e8eebfd770b5b368fa601fac797979a1dd2 Mon Sep 17 00:00:00 2001 From: rra Date: Thu, 7 May 2020 19:08:49 +0200 Subject: [PATCH] harmonize styling of console commands --- ...configuring_an_xmpp_server_prosody_0.11.md | 40 +++++++++---------- .../server-support-for-audio-video-calls.md | 9 +++-- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/content/instant-messaging/configuring_an_xmpp_server_prosody_0.11.md b/content/instant-messaging/configuring_an_xmpp_server_prosody_0.11.md index 29c2b86..1ba8ceb 100644 --- a/content/instant-messaging/configuring_an_xmpp_server_prosody_0.11.md +++ b/content/instant-messaging/configuring_an_xmpp_server_prosody_0.11.md @@ -43,11 +43,11 @@ This is among others required for Gajim plugins to work properly; self-generated Install Certbot and get new certificates for your domain (replace myserver.org with your own): :::console - sudo apt-get update && sudo apt-get install certbot - certbot certonly -d myserver.org - certbot certonly -d groups.myserver.org - certbot certonly -d upload.myserver.org - certbot certonly -d proxy.myserver.org + $ sudo apt-get update && sudo apt-get install certbot + $ certbot certonly -d myserver.org + $ certbot certonly -d groups.myserver.org + $ certbot certonly -d upload.myserver.org + $ certbot certonly -d proxy.myserver.org Pick an authentication method that [best fits your situation](https://certbot.eff.org/docs/using.html#getting-certificates-and-choosing-plugins). If you don't have a webserver running, using the 'standalone' option works well. @@ -68,26 +68,26 @@ Installing and configuring Prosody, the XMPP server Install the newest version of Prosody and its dependencies from the official prosody repository: :::console - echo deb http://packages.prosody.im/debian $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list + $ echo deb http://packages.prosody.im/debian $(lsb_release -sc) main | sudo tee -a /etc/apt/sources.list - wget https://prosody.im/files/prosody-debian-packages.key -O- | sudo apt-key add - + $ wget https://prosody.im/files/prosody-debian-packages.key -O- | sudo apt-key add - - sudo apt-get update && sudo apt-get install prosody lua-sec + $ sudo apt-get update && sudo apt-get install prosody lua-sec Install the newest prosody plugins: :::console - apt-get install mercurial - cd /usr/src - hg clone https://hg.prosody.im/prosody-modules/ prosody-modules + $ apt-get install mercurial + $ cd /usr/src + $ hg clone https://hg.prosody.im/prosody-modules/ prosody-modules Make a backup of the default prosody configuration and install [the one by the homebrewserver.club](https://homebrewserver.club/downloads/prosody.0.11.cfg.lua) :::console - cd /etc/prosody - cp prosody.cfg.lua prosody.cfg.lua.original - wget https://homebrewserver.club/downloads/prosody.0.11.cfg.lua -O prosody.cfg.lua + $ cd /etc/prosody + $ cp prosody.cfg.lua prosody.cfg.lua.original + $ wget https://homebrewserver.club/downloads/prosody.0.11.cfg.lua -O prosody.cfg.lua The homebrewserver.club prosody config --- @@ -181,14 +181,14 @@ The homebrewserver.club prosody config Replace all instances of the placeholder domain name with `yourdomain` in the config file with your own: :::console - sed -i 's/myserver.org/yourdomain/g' prosody.cfg.lua + $ sed -i 's/myserver.org/yourdomain/g' prosody.cfg.lua Alternatively you can change them by hand. They are on lines 70, 81, 84, 88, 91 of prosody.cfg.lua Make Prosody import the LetsEncrypt certificates: :::console - prosodyctl --root cert import /etc/letsencrypt/live + $ prosodyctl --root cert import /etc/letsencrypt/live You might get the following output: @@ -203,7 +203,7 @@ Finishing up Add an entry to cron to automatically renew LetsEncrypt certificates :::console - sudo crontab -e + $ sudo crontab -e And add: @@ -215,12 +215,12 @@ This will check and renew the certificates every week on sunday at 04:00. After you've set up all of the above it is time to start the server: :::console - /etc/init.d/prosody restart + $ /etc/init.d/prosody restart Users can be added from the command line, you will also be prompted for a password: :::console - prosodyctl adduser me@myserver.org + $ prosodyctl adduser me@myserver.org Alternatively you can change `allow_registration = false;` to `allow_registration = true;` in the config (line 35) to allow users to register accounts on your server via their clients. @@ -238,7 +238,7 @@ Previous versions of this guide[^1] included instructions how to set up a MySQL/ When upgrading to prosody 0.11 on a server using sql make sure to run database upgrades with: :::console - prosodyctl mod_storage_sql upgrade + $ prosodyctl mod_storage_sql upgrade [^1]: Previous articles descibed how to set up [Prosody 0.9](https://homebrewserver.club/drafts/configuring-a-modern-xmpp-server-0.9.html) and [Prosody 0.10](https://homebrewserver.club/drafts/configuring-a-modern-xmpp-server-0.10.html) diff --git a/content/instant-messaging/server-support-for-audio-video-calls.md b/content/instant-messaging/server-support-for-audio-video-calls.md index f41cbda..bdf5f52 100644 --- a/content/instant-messaging/server-support-for-audio-video-calls.md +++ b/content/instant-messaging/server-support-for-audio-video-calls.md @@ -4,7 +4,7 @@ Tags: xmpp, chat, coturn, instant messaging, prosody, audio/video calls Slug: server-support-for-audio-video-calls Summary: Configure support for audio/video calls with Prosody, Category: instant messaging -Status: draft +Status: published [TOC] @@ -15,7 +15,7 @@ This is a guide to set up server-side support for audio/video calls over XMPP. T Like the other guides, this one assumes Debian stable running on the server, the fact that you will end up hosting a few of your friends and that you have some basic skills working on a linux command line. -Furthermore it assumes you have already installed and configured Prosody. If you haven't, take a look at our guide ['Configuring an XMPP server for secure, mobile instant messaging']({filename}instant-messaging/configuring_an_xmpp_server_prosody_0.11.md) first. +Furthermore it assumes you have already installed and configured Prosody. If you haven't, take a look at our guide ['Configuring an XMPP server for secure, mobile instant messaging']({filename}configuring_an_xmpp_server_prosody_0.11.md) first. Set up firewall @@ -96,10 +96,11 @@ Then, set `static-auth-secret` to a decently long passphrase. You can also gener Take note of it because we will need this secret later. -Finally, edit the paths to the Let's Encrypt certificates to whatever you've set in ['Configuring an XMPP server for secure, mobile instant messaging']({filename}instant-messaging/configuring_an_xmpp_server_prosody_0.11.md#enabling-https). +Finally, edit the paths to the Let's Encrypt certificates to whatever you've set in ['Configuring an XMPP server for secure, mobile instant messaging']({filename}configuring_an_xmpp_server_prosody_0.11.md#enabling-https). Once you are done move it in to place: - ::: console + + :::console $ sudo mv turnserver.conf /etc/turnserver.conf Update & set up Prosody