diff --git a/install/setup1.sh b/install/setup1.sh index 72d910c2ad..0f513d71f0 100644 --- a/install/setup1.sh +++ b/install/setup1.sh @@ -41,7 +41,7 @@ ln -s /etc/nginx/sites-available/mastodon /etc/nginx/sites-enabled/mastodon cp /home/mastodon/live/dist/mastodon-*.service /etc/systemd/system/ systemctl daemon-reload -echo << EOF +cat << EOF ============== [kmyblue setup script 1 completed] ================ diff --git a/install/setup2.sh b/install/setup2.sh index 8ec4cb3d49..7b8b1e7a80 100644 --- a/install/setup2.sh +++ b/install/setup2.sh @@ -2,56 +2,3 @@ git clone https://github.com/rbenv/rbenv.git ~/.rbenv cd ~/.rbenv && src/configure && make -C src echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc echo 'eval "$(rbenv init -)"' >> ~/.bashrc -exec bash -git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build - -RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install 3.2.2 -rbenv global 3.2.2 - -gem install bundler --no-document - -cd live - -yarn install --pure-lockfile - -bundle config deployment 'true' -bundle config without 'development test' -bundle install -j$(getconf _NPROCESSORS_ONLN) - -echo << EOF - -============== [kmyblue setup script 2 completed] ================ - -PostgreSQL and Redis are now available on localhost. - -* PostgreSQL - host : /var/run/postgresql - user : mastodon - database : mastodon_production - password : ohagi - -* Redis - host : localhost - -[IMPORTANT] Check PostgreSQL password before setup! - -Input this command to finish setup: - cd live - RAILS_ENV=production bundle exec rake mastodon:setup - -If you update kmyblue version, use following: - /home/mastodon/update - -EOF - - -# パスワード変更 -# sudo -u postgres psql << EOF -# ALTER USER mastodon WITH PASSWORD 'ohagi'; -# EOF - -# サーバー設定変更 -# sudo vi /etc/nginx/sites-available/mastodon - -# サーバー起動・OS起動時自動起動設定 -# systemctl enable --now mastodon-web mastodon-sidekiq mastodon-streaming diff --git a/install/setup3.sh b/install/setup3.sh new file mode 100644 index 0000000000..dd79145145 --- /dev/null +++ b/install/setup3.sh @@ -0,0 +1,52 @@ +git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build + +RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install 3.2.2 +rbenv global 3.2.2 + +gem install bundler --no-document + +cd live + +yarn install --pure-lockfile + +bundle config deployment 'true' +bundle config without 'development test' +bundle install -j$(getconf _NPROCESSORS_ONLN) + +cat << EOF + +============== [kmyblue setup script 2 completed] ================ + +PostgreSQL and Redis are now available on localhost. + +* PostgreSQL + host : /var/run/postgresql + user : mastodon + database : mastodon_production + password : ohagi + +* Redis + host : localhost + +[IMPORTANT] Check PostgreSQL password before setup! + +Input this command to finish setup: + cd live + RAILS_ENV=production bundle exec rake mastodon:setup + +If you update kmyblue version, use following: + /home/mastodon/update + +EOF + + +# パスワード変更 +# sudo -u postgres psql << EOF +# ALTER USER mastodon WITH PASSWORD 'ohagi'; +# EOF + +# サーバー設定変更 +# sudo vi /etc/nginx/sites-available/mastodon + +# サーバー起動・OS起動時自動起動設定 +# systemctl enable --now mastodon-web mastodon-sidekiq mastodon-streaming