aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornemsia <nemsia@nemsia.org>2017-07-25 13:29:04 +0200
committernemsia <nemsia@nemsia.org>2017-07-25 13:29:04 +0200
commitc50b19af34a3990a6892e23de04c66561d2063c9 (patch)
treefe277cc28a42ec69bf154a955bacd4f032f93ef9
parent60ae6587feb89feb6221d43d89fac40eb44165a8 (diff)
parent03074519069383688f69ee7f0dc619b067d9917f (diff)
downloadmastodon_ynh-c50b19af34a3990a6892e23de04c66561d2063c9.tar.gz
mastodon_ynh-c50b19af34a3990a6892e23de04c66561d2063c9.tar.bz2
mastodon_ynh-c50b19af34a3990a6892e23de04c66561d2063c9.zip
Merge remote-tracking branch 'refs/remotes/origin/master' into upgrade-from-pre-release
-rw-r--r--README.md2
-rw-r--r--scripts/install2
-rw-r--r--scripts/upgrade2
3 files changed, 4 insertions, 2 deletions
diff --git a/README.md b/README.md
index 2459580..14cfa07 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@
[![Yunohost version](https://img.shields.io/badge/yunohost-2.5.6_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)
+
:warning: MAJ 05/06/17 :Cette application peut maintenant fonctionner sur ARM, mais l'installation prend plusieurs heures et il faut ajouter un swapfile de 1Go.
:warning: Cette application utilise les packages backports de Debian, nous vous recommendons de ne pas installer cette application directement en production
diff --git a/scripts/install b/scripts/install
index b7e175c..b088eca 100644
--- a/scripts/install
+++ b/scripts/install
@@ -41,7 +41,7 @@ ynh_app_setting_set $app language $language
sudo adduser $app --home /opt/$app --gecos "First Last,RoomNumber,WorkPhone,HomePhone" --disabled-password --disabled-login
# Install debian package
-ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https pkg-config libprotobuf-dev protobuf-compiler
+ynh_package_install imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev
# Install redis package
ynh_package_install redis-server redis-tools
diff --git a/scripts/upgrade b/scripts/upgrade
index 9dffa34..5c64116 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,7 +64,7 @@ if [[ $node_version =~ ^v4.*$ ]]; then
fi
# add additional package for release 1.4
-ynh_package_install pkg-config libprotobuf-dev protobuf-compiler
+ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev
# Apply Mastodon upgrade
sudo su - $app <<COMMANDS