From 7f6ff4622220443a674eca1d67e74acb80b26798 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Thu, 9 Jun 2022 15:10:52 +0200
Subject: Implement 5036: more readable diff on configuration file when
 upgrading.

---
 scripts/upgrade.sh        | 3 ++-
 support/doc/production.md | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh
index 9c17aecb8..e70576285 100755
--- 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 6d7744b1f..ea0a98395 100644
--- 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:
-- 
cgit v1.2.3