aboutsummaryrefslogtreecommitdiff
path: root/scripts/upgrade
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/upgrade')
-rw-r--r--scripts/upgrade33
1 files changed, 13 insertions, 20 deletions
diff --git a/scripts/upgrade b/scripts/upgrade
index 771b98b..367ee94 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,12 +13,12 @@ app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get "$app" domain)
path=$(ynh_app_setting_get "$app" path)
admin=$(ynh_app_setting_get "$app" admin)
-is_public=$(ynh_app_setting_get "$app" is_public)
+language=$(ynh_app_setting_get "$app" language)
CHECK_PATH # Checks and corrects the syntax of the path.
# Check if admin is not null
-if [[ "$admin" = "" || "$is_public" = "" || "$language" = "" ]]; then
+if [[ "$admin" = "" || "$language" = "" ]]; then
echo "Unable to upgrade, please contact support"
ynh_die
fi
@@ -32,29 +32,22 @@ sudo sed -i "s@__PATH__@$app@g" ../conf/nginx.conf*
sudo sed -i "s@__FINALPATH__@$final_path/@g" ../conf/nginx.conf*
# Stop Mastodon Services
-sudo systemctl stop /etc/systemd/system/mastodon-*.service
+sudo systemctl stop mastodon-*.service
# Update Mastodon
sudo su - $app <<COMMANDS
pushd ~/live
-git pull
-RAILS_ENV=production bin/bundle exec rails db:migrate
-RAILS_ENV=production bin/bundle exec rails assets:precompile
+git fetch
+git pull https://github.com/tootsuite/mastodon.git master
+git checkout v1.2
+bin/bundle install
+yarn install --production
+RAILS_ENV=production bundle exec rails assets:clean
+RAILS_ENV=production bundle exec rails assets:precompile
+RAILS_ENV=production bundle exec rails db:migrate
COMMANDS
-# Start Mastodon Services
-sudo systemctl start /etc/systemd/system/mastodon-*.service
-
-# If app is public, add url to SSOWat conf as skipped_uris
-if [ $is_public = "Yes" ];
-then
- ynh_app_setting_set "$app" unprotected_uris "/"
- sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
-else
- sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
-fi
-
# Reload Nginx
sudo systemctl reload nginx
-# Reload Mastodon
-sudo systemctl restart mastodon-*.service
+# Restart Mastodon
+sudo systemctl start mastodon-*.service \ No newline at end of file