From e438a0ab3eda6a63150ceaa983e1614836c07b70 Mon Sep 17 00:00:00 2001 From: nemsia Date: Wed, 7 Jun 2017 20:42:42 +0200 Subject: [PATCH 1/2] Fix install on arm (#42) * [fix] Missing pubkey on arm * [enh] Install on arm + update README --- README.md | 57 +++++++++++++++++++++++++++++++++++++++++++------ scripts/install | 7 ++++++ 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3cd6796..c985c53 100644 --- a/README.md +++ b/README.md @@ -7,11 +7,11 @@ [![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) -:warning: Cette application ne fonctionne que sur x86, x86_64 et non sur ARM (Raspberry,Olimex,Labriqueinternet,...). T_T +: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 -:warning: This app work only on x86, x86_64 and not on ARM (Raspberry,Olimex,InternetCube,...). T_T +:warning: UPDATE 05/06/17 :This app can work now on ARM, but installation takes several hours and you must add a swapfile of 1GB. :warning: This application uses the Debian backports packages, do not install this application directly in production @@ -21,13 +21,35 @@ Mastodon est un réseau social gratuit et open source. Une alternative décentra [Source code](https://github.com/tootsuite/mastodon) +#### Ajout d'un "swapfile" si vous avez moins de 2Go de RAM +``` +sudo dd if=/dev/zero of=/swapfile bs=1024 count=1024000 +sudo chmod 600 /swapfile +sudo mkswap /swapfile +sudo swapon /swapfile +``` +ajouter cette ligne dans /etc/fstab +``` +/swapfile none swap sw 0 0 +``` + ### Installation -`$ sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh.git` - +#### Utilisation de __screen__ en cas de déconnection +``` +$ sudo apt-get install screen +$ screen +$ sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh.git +``` +Récuperer l'installation après une deconnection: +``` +$ screen -d +$ screen -r +``` L'utilisateur admin est crée automatiquement comme: user@domain.tld ### Mise à jour +#### Utilisation de __screen__ fortement recommandé `$ sudo yunohost app upgrade --verbose mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh.git` @@ -43,13 +65,34 @@ Mastodon is a free, open-source social network. A decentralized alternative to c [Source code](https://github.com/tootsuite/mastodon) +#### Adding "swapfile" If you have less than 2Go of RAM +``` +sudo dd if=/dev/zero of=/swapfile bs=1024 count=1024000 +sudo chmod 600 /swapfile +sudo mkswap /swapfile +sudo swapon /swapfile +``` +add this line on /etc/fstab +``` +/swapfile none swap sw 0 0 +``` + ### Install - -`$ sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh.git` - +#### Using __screen__ in case of disconnect +``` +$ sudo apt-get install screen +$ screen +$ sudo yunohost app install https://github.com/YunoHost-Apps/mastodon_ynh.git +``` +Recover after disconnect: +``` +$ screen -d +$ screen -r +``` The admin user is automatically created as: user@domain.tld ### Update +#### Using __screen__ highly recommended `$ sudo yunohost app upgrade --verbose mastodon -u https://github.com/YunoHost-Apps/mastodon_ynh.git` diff --git a/scripts/install b/scripts/install index a4faed3..17a4573 100644 --- a/scripts/install +++ b/scripts/install @@ -52,6 +52,13 @@ ynh_package_install postgresql postgresql-contrib # Install Ruby ynh_package_install autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev +# Import debian archive pubkey, need on ARM arch +arch=$(uname -m) +if [[ $arch = arm* ]]; then + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553 + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010 +fi + # Install source.list debian package backports & yarn sudo cp ../conf/backports.list /etc/apt/sources.list.d/ sudo curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - From d7b8bd7b23e3603c099bfff78be4a58926108e67 Mon Sep 17 00:00:00 2001 From: MCMic Date: Thu, 15 Jun 2017 10:47:06 +0200 Subject: [PATCH 2/2] Added needed line for 1.4.2 migration --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index a741c4d..4308838 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,6 +72,8 @@ sudo su - $app < 1.4.2 migration prepare_for_foreign_keys is needed +RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys RAILS_ENV=production bundle exec rails assets:clean RAILS_ENV=production bundle exec rails assets:precompile RAILS_ENV=production bundle exec rails db:migrate