Implement 5036: more readable diff on configuration file when upgrading.

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 9c17aecb89da629499e1da94a756e80446fdf730..e70576285bef4e30c8049b0b0a28ce6a56703fde 100755 (executable)
--- a/scripts/upgrade.sh
+++ b/scripts/upgrade.sh
@@ -78,7 +78,8 @@ ln -s "$PEERTUBE_PATH/versions/peertube-${VERSION}" $PEERTUBE_PATH/peertube-late
 cp $PEERTUBE_PATH/peertube-latest/config/default.yaml $PEERTUBE_PATH/config/default.yaml
 
 echo "Differences in configuration files..."
-diff -u $PEERTUBE_PATH/config/production.yaml "$PEERTUBE_PATH/versions/peertube-${VERSION}/config/production.yaml.example"
+cd $PEERTUBE_PATH/versions
+diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example"
 
 echo ""
 echo "==========================================="

diff --git a/support/doc/production.md b/support/doc/production.md
index 6d7744b1f613349ee343277bc02645930b1ce185..ea0a983951f8f8afa9c24a111667128b44d18073 100644 (file)
--- a/support/doc/production.md
+++ b/support/doc/production.md
@@ -339,6 +339,15 @@ $ cd /var/www/peertube && \
     sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest
 ```
 
+### Configuration
+
+You can check for configuration changes, and report them in your `config/production.yaml` file:
+
+```bash
+$ cd /var/www/peertube/versions
+$ diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example"
+```
+
 ### nginx
 
 Check changes in nginx configuration: