aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJohn Livingston <git@john-livingston.fr>2022-06-09 15:10:52 +0200
committerChocobozzz <chocobozzz@cpy.re>2022-06-13 15:59:22 +0200
commit7f6ff4622220443a674eca1d67e74acb80b26798 (patch)
tree34b1b9550160e591ada46bc1ec22638961baea7b
parent92148a7a396e9bfb8e46a125cc2e31298fd0fcd5 (diff)
downloadPeerTube-7f6ff4622220443a674eca1d67e74acb80b26798.tar.gz
PeerTube-7f6ff4622220443a674eca1d67e74acb80b26798.tar.zst
PeerTube-7f6ff4622220443a674eca1d67e74acb80b26798.zip
Implement 5036: more readable diff on configuration file when upgrading.
-rwxr-xr-xscripts/upgrade.sh3
-rw-r--r--support/doc/production.md9
2 files changed, 11 insertions, 1 deletions
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
78cp $PEERTUBE_PATH/peertube-latest/config/default.yaml $PEERTUBE_PATH/config/default.yaml 78cp $PEERTUBE_PATH/peertube-latest/config/default.yaml $PEERTUBE_PATH/config/default.yaml
79 79
80echo "Differences in configuration files..." 80echo "Differences in configuration files..."
81diff -u $PEERTUBE_PATH/config/production.yaml "$PEERTUBE_PATH/versions/peertube-${VERSION}/config/production.yaml.example" 81cd $PEERTUBE_PATH/versions
82diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example"
82 83
83echo "" 84echo ""
84echo "===========================================" 85echo "==========================================="
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 && \
339 sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest 339 sudo -u peertube ln -s versions/peertube-${VERSION} ./peertube-latest
340``` 340```
341 341
342### Configuration
343
344You can check for configuration changes, and report them in your `config/production.yaml` file:
345
346```bash
347$ cd /var/www/peertube/versions
348$ diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example"
349```
350
342### nginx 351### nginx
343 352
344Check changes in nginx configuration: 353Check changes in nginx configuration: