From a8b5ce95f5e9cb71079e5d3606eab14f65d4b57a Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 14 Feb 2018 11:09:02 +0100 Subject: [PATCH] Better upgrade script consistency --- scripts/upgrade.sh | 24 ++++++++---------------- support/doc/production.md | 16 +++++++--------- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index d6ee9d166..e7c34a6b4 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -1,34 +1,26 @@ #!/bin/bash -### Note !! ### -# On shell prompt do : -# -# $ su - peertube -# $ ./upgrade.sh -############ - -# Stcict mode +# Strict mode set -e # Backup database SQL_BACKUP_PATH="/var/www/peertube/backup/sql-peertube_prod-$(date -Im).bak" -mkdir -p ~/backup +mkdir -p /var/www/peertube/backup pg_dump -U peertube -W -h localhost -F c peertube_prod -f "$SQL_BACKUP_PATH" # Get and Display the Latest Version 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" -wget -q "https://github.com/Chocobozzz/PeerTube/releases/download/${VERSION}/peertube-${VERSION}.zip" -O ~/versions/peertube-${VERSION}.zip -cd ~/versions +wget -q "https://github.com/Chocobozzz/PeerTube/releases/download/${VERSION}/peertube-${VERSION}.zip" -O /var/www/peertube/versions/peertube-${VERSION}.zip +cd /var/www/peertube/versions unzip -o peertube-${VERSION}.zip rm -f peertube-${VERSION}.zip # Upgrade Scripts -rm -rf ~/peertube-latest -ln -s ~/versions/peertube-${VERSION} ~/peertube-latest -cd ~/peertube-latest +rm -rf /var/www/peertube/peertube-latest +ln -s /var/www/peertube/versions/peertube-${VERSION} /var/www/peertube/peertube-latest +cd /var/www/peertube/peertube-latest yarn install --production --pure-lockfile -cp ~/peertube-latest/config/default.yaml ~/config/default.yaml -diff ~/peertube-latest/config/production.yaml.example ~/config/production.yaml +cp /var/www/peertube/peertube-latest/config/default.yaml /var/www/peertube/config/default.yaml exit 0 diff --git a/support/doc/production.md b/support/doc/production.md index e3187d481..06a51dedf 100644 --- a/support/doc/production.md +++ b/support/doc/production.md @@ -289,19 +289,17 @@ $ cd /var/www/peertube/peertube-latest && NODE_CONFIG_DIR=/var/www/peertube/conf ``` ## Upgrade -#### Auto -Via the bash Script : +#### Auto (minor versions only) ``` -$ su - peertube -$ cd scripts && ./upgrade.sh -$ exit -$ systemctl restart peertube -$ systemctl status peertube +$ cd /var/www/peertube/peertube-latest/scripts && sudo -u peertube ./upgrade.sh +$ diff /var/www/peertube/versions/peertube-${VERSION}/config/production.yaml.example /var/www/peertube/config/production.yaml +$ sudo systemctl restart peertube && sudo journalctl -fu peertube ``` -#### Manuel +#### Manually + Make a SQL backup ``` @@ -336,7 +334,7 @@ Copy new configuration defaults values and update your configuration file: ``` $ 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 /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: