From 0e98c398536e886126983e5526529792544a376e Mon Sep 17 00:00:00 2001 From: nemsia Date: Thu, 31 May 2018 10:06:20 +0200 Subject: [PATCH] Change systemd mastodon service restart * Change systemd script for stretch * Ready to mastodon 2.4.1 --- README.md | 4 ++-- manifest.json | 2 +- scripts/install | 2 +- scripts/remove | 6 +++--- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 103ebcd..488481d 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Mastodon for YunoHost -[![Latest Version](https://img.shields.io/badge/version-2.4.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases) +[![Latest Version](https://img.shields.io/badge/version-2.4.1-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases) [![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones) [![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies) [![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE) -[![Yunohost version](https://img.shields.io/badge/yunohost-2.7.7_tested-orange.svg?style=flat)](https://github.com/YunoHost/yunohost) +[![Yunohost version](https://img.shields.io/badge/yunohost-2.7.12_tested-orange.svg?style=flat)](https://github.com/YunoHost/yunohost) [![GitHub issues](https://img.shields.io/github/issues/YunoHost-Apps/mastodon_ynh.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/issues) [![Install Mastodon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mastodon) diff --git a/manifest.json b/manifest.json index 2952e49..8bf61fe 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Mastodon is a free, open-source social network.", "fr": "Mastodon est un réseau social gratuit et open source." }, - "version": "2.4.0", + "version": "2.4.1", "url": "https://github.com/tootsuite/mastodon", "license": "AGPL v3.0", "maintainer": { diff --git a/scripts/install b/scripts/install index 0bd7c05..d92e0ed 100644 --- a/scripts/install +++ b/scripts/install @@ -205,7 +205,7 @@ sudo cp ../conf/mastodon-streaming.service /etc/systemd/system/mastodon-streamin sudo chown root: /etc/systemd/system/mastodon-streaming.service sudo systemctl daemon-reload -sudo systemctl enable /etc/systemd/system/mastodon-*.service +sudo systemctl enable mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service sudo systemctl start mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service # debug sudo systemctl status mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service diff --git a/scripts/remove b/scripts/remove index 4876f7d..19ab132 100644 --- a/scripts/remove +++ b/scripts/remove @@ -23,24 +23,24 @@ domain=$(ynh_app_setting_get "$app" domain) if [ -e "/etc/systemd/system/mastodon-web.service" ]; then echo "Delete systemd script" sudo systemctl stop mastodon-web.service - ynh_secure_remove "/etc/systemd/system/mastodon-web.service" sudo systemctl disable mastodon-web.service + ynh_secure_remove "/etc/systemd/system/mastodon-web.service" fi # Stop mastodon-sidekiq if [ -e "/etc/systemd/system/mastodon-sidekiq.service" ]; then echo "Delete systemd script" sudo systemctl stop mastodon-sidekiq.service - ynh_secure_remove "/etc/systemd/system/mastodon-sidekiq.service" sudo systemctl disable mastodon-sidekiq.service + ynh_secure_remove "/etc/systemd/system/mastodon-sidekiq.service" fi # Stop mastodon-sidekiq if [ -e "/etc/systemd/system/mastodon-streaming.service" ]; then echo "Delete systemd script" sudo systemctl stop mastodon-streaming.service - ynh_secure_remove "/etc/systemd/system/mastodon-streaming.service" sudo systemctl disable mastodon-streaming.service + ynh_secure_remove "/etc/systemd/system/mastodon-streaming.service" fi # Delete service on Yunohost monitoring diff --git a/scripts/restore b/scripts/restore index 5ab28bb..c6031de 100644 --- a/scripts/restore +++ b/scripts/restore @@ -194,7 +194,7 @@ sudo cp ./systemd_streaming.service /etc/systemd/system/mastodon-streaming.servi sudo chown root: /etc/systemd/system/mastodon-streaming.service sudo systemctl daemon-reload -sudo systemctl enable /etc/systemd/system/mastodon-*.service +sudo systemctl enable mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service sudo systemctl start mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service # debug sudo systemctl status mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service diff --git a/scripts/upgrade b/scripts/upgrade index 614c356..6035d48 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,7 +35,7 @@ sudo sed -i "s@__FINALPATH__@$final_path@g" ../conf/nginx.conf* sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf # Stop Mastodon Services -sudo systemctl stop mastodon-*.service +sudo systemctl stop mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service # Change owner of live folder sudo chown -R $app: $final_path/live @@ -105,7 +105,7 @@ RAILS_ENV=production $final_path/.rbenv/versions/2.5.1/bin/bundle exec rails mas UCOMMANDS # Restart Mastodon -sudo systemctl start mastodon-*.service +sudo systemctl start mastodon-web.service mastodon-sidekiq.service mastodon-streaming.service # Waiting start all services sleep 30