Merge d4642d2973 into d2673b8ea3

scripts/install

@@ -85,13 +85,17 @@ sudo su -c "psql" postgres <<< \
 ynh_psql_create_db_without_password "$app"
 sudo systemctl restart postgresql
 
-# Download all Ruby source
+# Download all sources rbenv, ruby and mastodon
 sudo su - $app <<CLONECOMMANDS
 git clone https://github.com/rbenv/rbenv.git $final_path/.rbenv
 git clone https://github.com/rbenv/ruby-build.git $final_path/.rbenv/plugins/ruby-build
 git clone https://github.com/tootsuite/mastodon.git $final_path/live
 CLONECOMMANDS
 
+# Switch to tagged release
+cd $final_path/live
+sudo git checkout $(git tag | tail -n 1)
+
 # Be king rewind (/var/cache/yunohost/from_file/scripts)
 popd
 
@@ -161,7 +165,7 @@ type rbenv
 BCOMMANDS
 
 # Add Services
-pushd $(popd)
+popd
 
 sudo cp ../conf/mastodon-web.service /etc/systemd/system/mastodon-web.service
 sudo chown root: /etc/systemd/system/mastodon-web.service

scripts/restore

@@ -70,6 +70,8 @@ sudo cp -a ./sources/. "$final_path"
 
 # Set permissions
 sudo chown -R $app: "$final_path"
+sudo chmod -R a+rx /home/yunohost.backup/tmp
+
 
 sudo ls -alh "$final_path"
 

scripts/upgrade

@@ -37,12 +37,20 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 # Stop Mastodon Services
 sudo systemctl stop mastodon-*.service
 
-# Update Mastodon
-sudo su - $app <<COMMANDS
+# Download Mastodon
+sudo su - $app <<PULLCOMMANDS
 pushd ~/live
 git fetch
 git pull https://github.com/tootsuite/mastodon.git master
-git checkout $(git tag | tail -n 1)
+PULLCOMMANDS
+
+# Switch branch to tagged release
+pushd /opt/mastodon/live
+sudo git checkout $(git tag | tail -n 1)
+
+# Apply Mastodon upgrade
+sudo su - $app <<COMMANDS
+pushd ~/live
 bin/bundle install
 yarn install --pure-lockfile
 RAILS_ENV=production bundle exec rails assets:clean