From 3d3913686526f4495cca6c0234ea06faf46b1bfe Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Sun, 7 May 2017 23:22:41 +0200
Subject: Sync (#11)

* [enh] Switch to tagged release

* [enh] Switch to tagged release on upgrade

* [fix] Restore pg dump

Restore pg dump with mastodon user.

* Change version on manifest

* [fix] Change rm dump to ynh_secure_remove

* [fix] Upgrade from 1.3.3

Fix error: Your local changes to the following files would be overwritten by merge:
        .babelrc
        .dockerignore
        .editorconfig
        .env.production.sample
        .gitignore
        .rubocop.yml
        .travis.yml
        Capfile
        Dockerfile
        README.md
        Vagrantfile
        ....

* [fix] Owner of live

* [fix] Reinstall dependencies on restore

* Return to home

* [fix] Jenkins upgrade error

* Check .fonctions

* Remove unneeded comment

* Add apt lists to backup

* Change .list name on backup

* Copy Apt .lists on restore

* version 1.3.3 on manifest

* Remove admin instructions + TODO
---
 scripts/upgrade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/upgrade')

diff --git a/scripts/upgrade b/scripts/upgrade
index b5d1b31..f19f3e7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -62,6 +62,9 @@ RAILS_ENV=production bundle exec rails assets:precompile
 RAILS_ENV=production bundle exec rails db:migrate
 COMMANDS
 
+# Restart Mastodon
+sudo systemctl start mastodon-*.service
+
 # Reload Nginx
 sudo systemctl reload nginx
 
@@ -70,6 +73,3 @@ ynh_app_setting_set "$app" unprotected_uris "/"
 
 # Reload SSOwat configuration
 sudo yunohost app ssowatconf
-
-# Restart Mastodon
-sudo systemctl start mastodon-*.service
-- 
cgit v1.2.3-70-g09d2