Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / support / doc / production.md

diff --git a/support/doc/production.md b/support/doc/production.md
index e711f09979f273304383004cb0c27eedeb443fb9..6d7744b1f613349ee343277bc02645930b1ce185 100644 (file)
--- a/support/doc/production.md
+++ b/support/doc/production.md
@@ -58,26 +58,34 @@ $ sudo -u postgres psql -c "CREATE EXTENSION unaccent;" peertube_prod
 
 ### :page_facing_up: Prepare PeerTube directory
 
-Fetch the latest tagged version of Peertube
+Fetch the latest tagged version of Peertube:
+
 ```bash
 $ VERSION=$(curl -s https://api.github.com/repos/chocobozzz/peertube/releases/latest | grep tag_name | cut -d '"' -f 4) && echo "Latest Peertube version is $VERSION"
 ```
 
-Open the peertube directory, create a few required directories
+
+Open the peertube directory, create a few required directories:
+
 ```bash
 $ cd /var/www/peertube
 $ sudo -u peertube mkdir config storage versions
 $ sudo -u peertube chmod 750 config/
 ```
 
-Download the latest version of the Peertube client, unzip it and remove the zip
+
+Download the latest version of the Peertube client, unzip it and remove the zip:
+
 ```bash
 $ cd /var/www/peertube/versions
+$ # Releases are also available on https://builds.joinpeertube.org/release
 $ sudo -u peertube wget -q "https://github.com/Chocobozzz/PeerTube/releases/download/${VERSION}/peertube-${VERSION}.zip"
 $ sudo -u peertube unzip -q peertube-${VERSION}.zip && sudo -u peertube rm peertube-${VERSION}.zip
 ```
 
+
 Install Peertube:
+
 ```bash
 $ cd /var/www/peertube
 $ sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest
@@ -252,7 +260,7 @@ $ tail -f /var/log/peertube/peertube.log
 
 ### :technologist: Administrator
 
-The administrator password is automatically generated and can be found in the PeerTube
+The administrator username is `root` and the password is automatically generated. It can be found in PeerTube
 logs (path defined in `production.yaml`). You can also set another password with:
 
 ```bash
@@ -320,7 +328,7 @@ Copy new configuration defaults values and update your configuration file:
 
 ```bash
 $ sudo -u peertube cp /var/www/peertube/versions/peertube-${VERSION}/config/default.yaml /var/www/peertube/config/default.yaml
-$ diff /var/www/peertube/versions/peertube-${VERSION}/config/production.yaml.example /var/www/peertube/config/production.yaml
+$ diff -u /var/www/peertube/versions/peertube-${VERSION}/config/production.yaml.example /var/www/peertube/config/production.yaml
 ```
 
 Change the link to point to the latest version:
@@ -337,7 +345,7 @@ Check changes in nginx configuration:
 
 ```bash
 $ cd /var/www/peertube/versions
-$ diff "$(ls --sort=t | head -2 | tail -1)/support/nginx/peertube" "$(ls --sort=t | head -1)/support/nginx/peertube"
+$ diff -u "$(ls --sort=t | head -2 | tail -1)/support/nginx/peertube" "$(ls --sort=t | head -1)/support/nginx/peertube"
 ```
 
 ### systemd
@@ -346,7 +354,7 @@ Check changes in systemd configuration:
 
 ```bash
 $ cd /var/www/peertube/versions
-$ diff "$(ls --sort=t | head -2 | tail -1)/support/systemd/peertube.service" "$(ls --sort=t | head -1)/support/systemd/peertube.service"
+$ diff -u "$(ls --sort=t | head -2 | tail -1)/support/systemd/peertube.service" "$(ls --sort=t | head -1)/support/systemd/peertube.service"
 ```
 
 ### Restart PeerTube