1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mastodon_ynh.git synced 2024-09-03 19:46:02 +02:00
This commit is contained in:
nemsia 2018-05-16 10:27:07 +02:00
parent e6589fa54b
commit 28cdf3a0c4
2 changed files with 11 additions and 11 deletions

View file

@ -170,14 +170,14 @@ eval \"\$(rbenv init -)\"" > $final_path/.profile
# Install ruby-build
(
exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.0
exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.0
exec_as "$app" $final_path/.rbenv/versions/2.5.0/bin/ruby -v
exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.1
exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.1
exec_as "$app" $final_path/.rbenv/versions/2.5.1/bin/ruby -v
)
# Create symlink for ruby
rm /usr/bin/ruby || true
ln -s $final_path/.rbenv/versions/2.5.0/bin/ruby /usr/bin/ruby || true
ln -s $final_path/.rbenv/versions/2.5.1/bin/ruby /usr/bin/ruby || true
# Adjust Mastodon config
# TODO: use official helper ynh_replace_string
@ -214,7 +214,7 @@ sed -i "s@#SMTP_OPENSSL_VERIFY_MODE=peer@SMTP_OPENSSL_VERIFY_MODE=none@g" "${fin
(
cd "$final_path/live"
su mastodon <<INSTALL
$final_path/.rbenv/versions/2.5.0/bin/gem install bundler
$final_path/.rbenv/versions/2.5.1/bin/gem install bundler
$final_path/live/bin/bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test --quiet
yarn install --production --no-progress --non-interactive --silent

View file

@ -113,23 +113,23 @@ cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
ynh_setup_source "$final_path/.rbenv" "app-rbenv"
ynh_setup_source "$final_path/.rbenv/plugins/ruby-build" "app-ruby-build"
# Install ruby 2.5.0
# Install ruby 2.5.1
(
exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.0 || true
exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.0 || true
exec_as "$app" $final_path/.rbenv/versions/2.5.0/bin/ruby -v
exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.1 || true
exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.1 || true
exec_as "$app" $final_path/.rbenv/versions/2.5.1/bin/ruby -v
)
# Create symlink for ruby
rm /usr/bin/ruby || true
ln -s $final_path/.rbenv/versions/2.5.0/bin/ruby /usr/bin/ruby || true
ln -s $final_path/.rbenv/versions/2.5.1/bin/ruby /usr/bin/ruby || true
# Preconfig CSS & JS
# Install Mastodon
(
sudo su - $app <<MCOMMANDS
pushd ~/live
$final_path/.rbenv/versions/2.5.0/bin/gem install bundler
$final_path/.rbenv/versions/2.5.1/bin/gem install bundler
bin/bundle install --deployment --without development test
yarn install --pure-lockfile
MCOMMANDS