diff options
| author | nemsia <nemsia@nemsia.org> | 2017-07-01 17:28:07 +0200 |
|---|---|---|
| committer | nemsia <nemsia@nemsia.org> | 2017-07-01 17:28:07 +0200 |
| commit | ce09f3e9498c0d289f5d4206783bdeb1f4307b2e (patch) | |
| tree | 7bffa9c0eb0cc8aa940eaeb73c6c80c82c12ecc1 /scripts | |
| parent | 6acd2c741667b6cd2b72ecca5d7fe7a36eb4d6db (diff) | |
| parent | daa700336a3e8f3c363946115f0e81299db961e2 (diff) | |
| download | mastodon_ynh-ce09f3e9498c0d289f5d4206783bdeb1f4307b2e.tar.gz mastodon_ynh-ce09f3e9498c0d289f5d4206783bdeb1f4307b2e.tar.bz2 mastodon_ynh-ce09f3e9498c0d289f5d4206783bdeb1f4307b2e.zip | |
Merge remote-tracking branch 'refs/remotes/YunoHost-Apps/master'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 7 | ||||
| -rw-r--r-- | scripts/upgrade | 2 |
2 files changed, 9 insertions, 0 deletions
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 - 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 <<COMMANDS pushd ~/live bin/bundle install yarn install --pure-lockfile +# For 1.4.1 -> 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 |